kopia lustrzana https://github.com/magicbug/Cloudlog
Revert "Merge pull request #725 from AndreasK79/adif_import_speedup"
This reverts commitpull/739/head62b8d024b6
, reversing changes made tob18777318d
.
rodzic
fa48db4263
commit
c6c7dd5cd8
|
@ -19,11 +19,10 @@ class ADIF_Parser
|
|||
{
|
||||
|
||||
var $data; //the adif data
|
||||
var $datasplit; // one line is one QSO in the array
|
||||
var $currentarray = 0; // current place in the array
|
||||
var $i; //the iterator
|
||||
var $current_line; //stores information about the current qso
|
||||
var $headers = array();
|
||||
|
||||
|
||||
public function initialize() //this function locates the <EOH>
|
||||
{
|
||||
|
||||
|
@ -109,8 +108,6 @@ class ADIF_Parser
|
|||
echo "Error: ADIF File Does Not Contain Any QSOs";
|
||||
return 0;
|
||||
};
|
||||
|
||||
$this->datasplit = preg_split("/<eor>/i", substr($this->data, $this->i));
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -179,15 +176,23 @@ class ADIF_Parser
|
|||
};
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//finds the next record in the file
|
||||
public function get_record()
|
||||
{
|
||||
if($this->currentarray >= count($this->datasplit))
|
||||
if($this->i >= strlen($this->data))
|
||||
{
|
||||
return array(); //return nothing
|
||||
};
|
||||
return $this->record_to_array($this->datasplit[$this->currentarray++]); //process and return output
|
||||
$end = stripos($this->data, "<eor>", $this->i);
|
||||
if($end == false) //is this the end?
|
||||
{
|
||||
return array(); //return nothing
|
||||
};
|
||||
$record = substr($this->data, $this->i, $end-$this->i);
|
||||
$this->i = $end+5;
|
||||
return $this->record_to_array($record); //process and return output
|
||||
}
|
||||
|
||||
public function get_header($key)
|
||||
|
@ -199,6 +204,6 @@ class ADIF_Parser
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
?>
|
Ładowanie…
Reference in New Issue