qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vgwort 0.4.2: Make it work with current zählmarken file format

Browse source
This commit is contained in:
onli 2020-09-21 20:30:00 +02:00
parent 0a1b48ef9f
commit 2dabdd9dc1
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
serendipity_event_vgwort/ChangeLog
View file

@ -1,3 +1,7 @@
Version 0.4.2:
==============
- Adapt "csv" parser for new zählmarken file
Version 0.4.1:
==============
- Fix location of English language file.

37
serendipity_event_vgwort/serendipity_event_vgwort.php
View file

@ -16,7 +16,7 @@ class serendipity_event_vgwort extends serendipity_event {
$propbag->add('description', PLUGIN_EVENT_VGWORT_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Malte Paskuda');
$propbag->add('version', '0.4.1');
$propbag->add('version', '0.4.2');
$propbag->add('requirements', array(
'serendipity' => '2.2.1'
));
@ -73,21 +73,26 @@ class serendipity_event_vgwort extends serendipity_event {
* Import the counter codes ("Zählmarken") stored in the given CSV. Store them in the database, with an entry id if there are available entries (=that are long enough)
* */
function import($csv) {
// NOTE: We should use one of the included CSV functions. But they don't work with the format the csv file has currently
$csv = explode(";Zählmarke für HTML Texte;Zählmarke für HTML Texte - SSL (https://...);Zählmarke für Dokumente (erlaubte Formate: PDF, ePub);Zählmarke für Dokumente (erlaubte Formate: PDF, ePub) - SSL (https://...)", $csv);
$entries = $this->markableEntries();
foreach ($csv as $csvline) {
// we have to remove newlines here, because the CSV currently contains newlines where there should be none,
// which trips up the selection via array indexes selection below
$csvline = str_replace(array("\n", "\r"), '', $csvline);
$csvline = explode(';', $csvline);
if (strpos($csvline[1], 'img') !== false) {
preg_match('@.*/na/(.*?)"@', $csvline[1], $counterPublic);
$counterPublic = $counterPublic[1];
$counterPrivate = $csvline[6];
$entryId = array_pop($entries);
$this->storeCounter($entryId, $counterPublic, $counterPrivate);
// NOTE: We should use one of the included CSV functions. But they don't work with the format the csv file has currently, since it is batshit crazy
$publicCounters = [];
$privateCounters = [];
$csv_split = explode("\n", $csv);
foreach ($csv_split as $line) {
preg_match('@https.*/na/(.*?)"@', $line, $counterPublic);
if ($counterPublic[1]) {
$publicCounters[] = $counterPublic[1];
}
preg_match('@;Privater Identifikationscode:;(.*);?@', $line, $counterPrivate);
if ($counterPrivate) {
$privateCounters[] = $counterPrivate[1];
}
}
$entries = $this->markableEntries();
for ($i=0; $i<count($publicCounters); $i++) {
$entryId = array_pop($entries);
$this->storeCounter($entryId, $publicCounters[$i], $privateCounters[$i]);
}
}
@ -114,7 +119,7 @@ class serendipity_event_vgwort extends serendipity_event {
}
/**
* Store a new triple of entry_id, public and private counter
* Store a new triple of entry_id, public and private counter. If entry_id is null the counters are seen as unused
* */
function storeCounter($entry_id, $public, $private) {
global $serendipity;