PSR2 fixes for /wikidata and /tests-php directories

diff --git a/tests-php/bootstrap.php b/tests-php/bootstrap.php
index a4abe2dafcb3fabac023b6d4630c24fed41379c0..b3d9bbc7f3711e882119cd6b3af051245d859d04 100644 (file)
--- a/tests-php/bootstrap.php
+++ b/tests-php/bootstrap.php
@@ -1,2 +1 @@
 <?php
-

diff --git a/wikidata/parse.php b/wikidata/parse.php
index 8a59c3d8e57890568ed74bc6def99025c25211ca..11b30fe1fae654c8d5dbff8f0fde44d134ce6d89 100755 (executable)
--- a/wikidata/parse.php
+++ b/wikidata/parse.php
@@ -20,14 +20,11 @@ if ($hFile) {
     while (($sLine = fgets($hFile, 4000000)) !== false) {
         if (substr($sLine, 0, 11) == '    <title>') {
             $sTitle = substr($sLine, 11, -9);
-        }
-        else if (substr($sLine, 0, 8) == '    <ns>') {
+        } elseif (substr($sLine, 0, 8) == '    <ns>') {
             $iNS = (int)substr($sLine, 8, -6);
-        }
-        else if (substr($sLine, 0, 8) == '    <id>') {
+        } elseif (substr($sLine, 0, 8) == '    <id>') {
             $iID = (int)substr($sLine, 8, -6);
-        }
-        else if (substr($sLine, 0, 33) == '      <text xml:space="preserve">') {
+        } elseif (substr($sLine, 0, 33) == '      <text xml:space="preserve">') {
             if ($iNS == -2) continue;
             if ($iNS == -1) continue;
             if ($iNS == 1) continue;
@@ -63,118 +60,108 @@ if ($hFile) {
 
             $iPID = $iQID = null;
             if ($aArticle['entity'][0] == 'p') {
-                $iPID = (int)substr($aArticle['entity'], 1);
-            } else if ($aArticle['entity'][0] == 'q') {
-                $iQID = (int)substr($aArticle['entity'], 1);
+                $iPID = (int) substr($aArticle['entity'], 1);
+            } elseif ($aArticle['entity'][0] == 'q') {
+                $iQID = (int) substr($aArticle['entity'], 1);
             } else {
                 continue;
             }
 
             echo ".";
 
-            fputcsv($hFileEntity, array($iID,$sTitle,$iPID,$iQID,@$aArticle['datatype']));
+            fputcsv($hFileEntity, array($iID, $sTitle, $iPID, $iQID, @$aArticle['datatype']));
 
-            foreach($aArticle['label'] as $sLang => $sLabel) {
-                fputcsv($hFileEntityLabel, array($iID,$sLang,$sLabel));
+            foreach ($aArticle['label'] as $sLang => $sLabel) {
+                fputcsv($hFileEntityLabel, array($iID, $sLang, $sLabel));
                 // echo "insert into entity_label values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
             }
 
-            foreach($aArticle['description'] as $sLang => $sLabel) {
-                fputcsv($hFileEntityDescription, array($iID,$sLang,$sLabel));
+            foreach ($aArticle['description'] as $sLang => $sLabel) {
+                fputcsv($hFileEntityDescription, array($iID, $sLang, $sLabel));
                 // echo "insert into entity_description values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
             }
 
-            foreach($aArticle['aliases'] as $sLang => $aLabels) {
+            foreach ($aArticle['aliases'] as $sLang => $aLabels) {
                 $aUniqueAlias = array();
-                foreach($aLabels as $sLabel) {
+                foreach ($aLabels as $sLabel) {
                     if (!isset($aUniqueAlias[$sLabel]) && $sLabel) {
-                    fputcsv($hFileEntityAlias, array($iID,$sLang,$sLabel));
-                    // echo "insert into entity_alias values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
-                    $aUniqueAlias[$sLabel] = true;
+                        fputcsv($hFileEntityAlias, array($iID, $sLang, $sLabel));
+                        // echo "insert into entity_alias values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
+                        $aUniqueAlias[$sLabel] = true;
+                    }
                 }
             }
-        }
-
-        foreach($aArticle['links'] as $sLang => $sLabel) {
-            fputcsv($hFileEntityLink, array($iID,$sLang,$sLabel));
-            // echo "insert into entity_link values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
-        }
-
-
-        if (isset($aArticle['claims'])) {
-
-            foreach($aArticle['claims'] as $iClaim => $aClaim) {
-
-                $bFail = false;
-            if ($aClaim['m'][0] == 'novalue') continue;
-            if ($aClaim['m'][0] == 'somevalue') continue;
-            $iPID = (int)$aClaim['m'][1];
-            if ($aClaim['m'][0] != 'value') $bFail = true;
-            if ($aClaim['m'][2]== 'wikibase-entityid') {
-
-                if ($aClaim['m'][3]['entity-type'] != 'item') $bFail = true;
-                fputcsv($hFileEntityProperty, array($iID,$iClaim,$iPID,null,$aClaim['m'][3]['numeric-id'],null,null));
-                // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",null,".$aClaim['m'][3]['numeric-id'].",null);\n";
-
-            } elseif ($aClaim['m'][2] == 'globecoordinate') {
-
-                if ($aClaim['m'][3]['globe'] != 'http://www.wikidata.org/entity/Q2') $bFail = true;
-                fputcsv($hFileEntityProperty, array($iID,$iClaim,$iPID,null,null,"SRID=4326;POINT(".((float)$aClaim['m'][3]['longitude'])." ".((float)$aClaim['m'][3]['latitude']).")",null));
-                // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",null,null,ST_SetSRID(ST_MakePoint(".((float)$aClaim['m'][3]['longitude']).", ".((float)$aClaim['m'][3]['latitude'])."),4326));\n";
-
-            } elseif ($aClaim['m'][2] == 'time') {
-                // TODO!
-/*
-        if ($aClaim['m'][3]['calendarmodel'] == 'http://www.wikidata.org/entity/Q1985727') {
-            // Gregorian
-            if (preg_match('#(\\+|-)0*([0-9]{4})-([0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2})Z#', $aClaim['m'][3]['time'], $aMatch)) {
-                if ((int)$aMatch[2] < 4700 && ) {
-                    $sDateString = $aMatch[2].'-'.$aMatch[3].($aClaim['m'][3]['timezone']>=0?'+':'').$aClaim['m'][3]['timezone'].($aMatch[1]=='-'?' bc':'');
-                    fputcsv($hFileEntityProperty, array($iID,$iClaim,$iPID,null,null,null,$sDateString));
-                }
-            } else {
-//              $bFail = true;
-            }
-        } elseif ( $aClaim['m'][3]['calendarmodel'] != 'http://www.wikidata.org/entity/Q1985786') {
-/ *
-            // Julian
-            if (preg_match('#(\\+|-)0*([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2})Z#', $aClaim['m'][3]['time'], $aMatch)) {
-var_dump($aMatch);
-exit;
-$iDayCount = juliantojd(2, 11, 1732);
-var_dump($iDayCount, jdtogregorian($iDayCount));
-            } else {
-                $bFail = true;
-exit;
-            }
-exit;
-* /
-        } else {
-//          $bFail = true;
-        }
-*/
-            } elseif ($aClaim['m'][2] == 'string') {
-
-                // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",'".pg_escape_string($aClaim['m'][3])."',null,null);\n";
-                fputcsv($hFileEntityProperty, array($iID,$iClaim,$iPID,$aClaim['m'][3],null,null,null));
-
-            } else {
-
-                $bFail = true;
 
+            foreach ($aArticle['links'] as $sLang => $sLabel) {
+                fputcsv($hFileEntityLink, array($iID, $sLang, $sLabel));
+                // echo "insert into entity_link values (".$iID.",'".pg_escape_string($sLang)."','".pg_escape_string($sLabel)."');\n";
             }
 
-            // Don't care about sources:    if ($aClaim['refs'] != array()) $bFail = true;
-
-            if ($bFail) {
-                var_dump($sTitle);
-                var_dump($aClaim);
-            } else {
-                // process
-            }
-
-        }
 
+            if (isset($aArticle['claims'])) {
+                //
+                foreach ($aArticle['claims'] as $iClaim => $aClaim) {
+                    //
+                    $bFail = false;
+                    if ($aClaim['m'][0] == 'novalue') continue;
+                    if ($aClaim['m'][0] == 'somevalue') continue;
+                    $iPID = (int)$aClaim['m'][1];
+                    if ($aClaim['m'][0] != 'value') $bFail = true;
+                    if ($aClaim['m'][2]== 'wikibase-entityid') {
+                        //
+                        if ($aClaim['m'][3]['entity-type'] != 'item') $bFail = true;
+                        fputcsv($hFileEntityProperty, array($iID, $iClaim, $iPID, null, $aClaim['m'][3]['numeric-id'], null, null));
+                        // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",null,".$aClaim['m'][3]['numeric-id'].",null);\n";
+                    } elseif ($aClaim['m'][2] == 'globecoordinate') {
+                        //
+                        if ($aClaim['m'][3]['globe'] != 'http://www.wikidata.org/entity/Q2') $bFail = true;
+                        fputcsv($hFileEntityProperty, array($iID, $iClaim, $iPID, null, null, "SRID=4326;POINT(".((float) $aClaim['m'][3]['longitude'])." ".((float)$aClaim['m'][3]['latitude']).")", null));
+                        // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",null,null,ST_SetSRID(ST_MakePoint(".((float)$aClaim['m'][3]['longitude']).", ".((float)$aClaim['m'][3]['latitude'])."),4326));\n";
+                    } elseif ($aClaim['m'][2] == 'time') {
+                        // TODO!
+                        /*
+                        if ($aClaim['m'][3]['calendarmodel'] == 'http://www.wikidata.org/entity/Q1985727') {
+                            // Gregorian
+                            if (preg_match('#(\\+|-)0*([0-9]{4})-([0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2})Z#', $aClaim['m'][3]['time'], $aMatch)) {
+                                if ((int)$aMatch[2] < 4700 && ) {
+                                    $sDateString = $aMatch[2].'-'.$aMatch[3].($aClaim['m'][3]['timezone']>=0?'+':'').$aClaim['m'][3]['timezone'].($aMatch[1]=='-'?' bc':'');
+                                    fputcsv($hFileEntityProperty, array($iID,$iClaim,$iPID,null,null,null,$sDateString));
+                                }
+                            } else {
+                                // $bFail = true;
+                            }
+                        } elseif ( $aClaim['m'][3]['calendarmodel'] != 'http://www.wikidata.org/entity/Q1985786') {
+                            // Julian
+                            if (preg_match('#(\\+|-)0*([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2})Z#', $aClaim['m'][3]['time'], $aMatch)) {
+                                var_dump($aMatch);
+                                exit;
+                                $iDayCount = juliantojd(2, 11, 1732);
+                                var_dump($iDayCount, jdtogregorian($iDayCount));
+                        } else {
+                            $bFail = true;
+                            exit;
+                        }
+                        exit;
+                    } else {
+                        // $bFail = true;
+                    }
+                    */
+                    } elseif ($aClaim['m'][2] == 'string') {
+                        // echo "insert into entity_property values (nextval('seq_entity_property'),".$iID.",".$iPID.",'".pg_escape_string($aClaim['m'][3])."',null,null);\n";
+                        fputcsv($hFileEntityProperty, array($iID, $iClaim, $iPID, $aClaim['m'][3], null, null, null));
+                    } else {
+                        $bFail = true;
+                    }
+
+                    // Don't care about sources:    if ($aClaim['refs'] != array()) $bFail = true;
+
+                    if ($bFail) {
+                        var_dump($sTitle);
+                        var_dump($aClaim);
+                    } else {
+                        // process
+                    }
+                }
             }
         }
     }

diff --git a/wikidata/pull_wikipedia_logs.php b/wikidata/pull_wikipedia_logs.php
index 3c5f5dfe168213c5698a5fdc79edaa0e1769d910..a7f6a9a3e21c3cb8b8a70ecd16b06fe97fdfb959 100644 (file)
--- a/wikidata/pull_wikipedia_logs.php
+++ b/wikidata/pull_wikipedia_logs.php
@@ -1,17 +1,14 @@
 <?php
 
-for($iTimestamp = mktime(0, 0, 0, 5, 1, 2013); $iTimestamp < mktime(0, 0, 0, 6, 15, 2013); $iTimestamp += 24*60*60)
-{
+for ($iTimestamp = mktime(0, 0, 0, 5, 1, 2013); $iTimestamp < mktime(0, 0, 0, 6, 15, 2013); $iTimestamp += 24*60*60) {
     $sYear = date("Y", $iTimestamp);
     $sMonth = date("Y-m", $iTimestamp);
     $sDay = date("Ymd", $iTimestamp);
 
-    for($iHour = 0; $iHour < 24; $iHour++)
-    {
+    for ($iHour = 0; $iHour < 24; $iHour++) {
         $sFilename = sprintf("pagecounts-".$sDay."-%02d0000", $iHour);
         echo $sFilename."\n";
-        if (!file_exists($sFilename.'.gz'))
-        {
+        if (!file_exists($sFilename.'.gz')) {
             exec('wget http://dumps.wikimedia.org/other/pagecounts-raw/'.$sYear.'/'.$sMonth.'/'.$sFilename.'.gz');
         }
 
@@ -25,57 +22,42 @@ for($iTimestamp = mktime(0, 0, 0, 5, 1, 2013); $iTimestamp < mktime(0, 0, 0, 6,
         $sPrevLine = true;
         $sDayLine = true;
 
-        do
-        {
-            if ($sPrevKey === $sDayKey)
-            {
+        do {
+            if ($sPrevKey === $sDayKey) {
                 if ($sPrevLine !== true) fputs($hNewTotals, "$sPrevKey ".($iPrevValue+$iDayValue)."\n");
                 $sPrevLine = true;
                 $sDayLine = true;
-            }
-            else if ($sDayKey !== false && ($sPrevKey > $sDayKey || $sPrevKey === false))
-            {
+            } elseif ($sDayKey !== false && ($sPrevKey > $sDayKey || $sPrevKey === false)) {
                 fputs($hNewTotals, "$sDayKey ".($iDayValue)."\n");
                 $sDayLine = true;
-            }
-            else if ($sPrevKey !== false && ($sDayKey > $sPrevKey || $sDayKey === false))
-            {
+            } elseif ($sPrevKey !== false && ($sDayKey > $sPrevKey || $sDayKey === false)) {
                 fputs($hNewTotals, "$sPrevKey ".($iPrevValue)."\n");
                 $sPrevLine = true;
             }
 
-            if ($sPrevLine === true)
-            {
+            if ($sPrevLine === true) {
                 $sPrevLine = $hPrevTotals?fgets($hPrevTotals, 4096):false;
-                if ($sPrevLine !== false)
-                {
+                if ($sPrevLine !== false) {
                     $aPrevLine = explode(' ', $sPrevLine);
                     $sPrevKey = $aPrevLine[0].' '.$aPrevLine[1];
                     $iPrevValue = (int)$aPrevLine[2];
-                }
-                else
-                {
+                } else {
                     $sPrevKey = false;
                     $iPrevValue =  0;
                 }
             }
 
-            if ($sDayLine === true)
-            {
+            if ($sDayLine === true) {
                 $sDayLine = $hDayTotals?fgets($hDayTotals, 4096):false;
-                if ($sDayLine !== false)
-                {
+                if ($sDayLine !== false) {
                     preg_match('#^([a-z]{2}) ([^ :]+) ([0-9]+) [0-9]+$#', $sDayLine, $aMatch);
                     $sDayKey = $aMatch[1].' '.$aMatch[2];
                     $iDayValue = (int)$aMatch[3];
-                }
-                else
-                {
+                } else {
                     $sDayKey = false;
                     $iDayValue = 0;
                 }
             }
-
         } while ($sPrevLine !== false || $sDayLine !== false);
 
         @fclose($hPrevTotals);