mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 13:30:52 -05:00 
			
		
		
		
	Enhance the ADIF parser to accept newlines between fields
ADIF allows any characters between fields to aid readability. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8082 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									1b1936d8d2
								
							
						
					
					
						commit
						8db9f1fc54
					
				@ -59,14 +59,25 @@ void ADIF::load()
 | 
			
		||||
    if (inputFile.open(QIODevice::ReadOnly))
 | 
			
		||||
    {
 | 
			
		||||
      QTextStream in(&inputFile);
 | 
			
		||||
      QString record;
 | 
			
		||||
 | 
			
		||||
      // skip header record
 | 
			
		||||
      while (!in.atEnd () && !record.contains ("<EOH>", Qt::CaseInsensitive))
 | 
			
		||||
        {
 | 
			
		||||
          record += in.readLine ();
 | 
			
		||||
        }
 | 
			
		||||
      while ( !in.atEnd() )
 | 
			
		||||
        {
 | 
			
		||||
            QString line = in.readLine();
 | 
			
		||||
          record.clear ();
 | 
			
		||||
          while (!in.atEnd () && !record.contains ("<EOR>", Qt::CaseInsensitive))
 | 
			
		||||
            {
 | 
			
		||||
              record += in.readLine ();
 | 
			
		||||
            }
 | 
			
		||||
          QSO q;
 | 
			
		||||
            q.call = _extractField(line,"CALL:");
 | 
			
		||||
            q.band = _extractField(line,"BAND:");
 | 
			
		||||
            q.mode = _extractField(line,"MODE:");
 | 
			
		||||
            q.date = _extractField(line,"QSO_DATE:");
 | 
			
		||||
          q.call = _extractField(record,"CALL:");
 | 
			
		||||
          q.band = _extractField(record,"BAND:");
 | 
			
		||||
          q.mode = _extractField(record,"MODE:");
 | 
			
		||||
          q.date = _extractField(record,"QSO_DATE:");
 | 
			
		||||
          if (q.call != "")
 | 
			
		||||
            _data.insert(q.call,q);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user