Merge remote-tracking branch 'upstream/master'

[nominatim.git] / wikidata / parse.php

diff --git a/wikidata/parse.php b/wikidata/parse.php
index 11b30fe1fae654c8d5dbff8f0fde44d134ce6d89..1bef50ec993ef4b8bd9983a5c0267a1df39db3dd 100755 (executable)
--- a/wikidata/parse.php
+++ b/wikidata/parse.php
@@ -1,14 +1,14 @@
 #!/usr/bin/php -Cq
 <?php
 
 #!/usr/bin/php -Cq
 <?php
 

-$hFile = @fopen("wikidatawiki-20130623-pages-articles.xml", "r");
+$hFile = @fopen('wikidatawiki-20130623-pages-articles.xml', 'r');

 
 

-$hFileEntity = fopen("entity.csv", "w");
-$hFileEntityLabel = fopen("entity_label.csv", "w");
-$hFileEntityDescription = fopen("entity_description.csv", "w");
-$hFileEntityAlias = fopen("entity_alias.csv", "w");
-$hFileEntityLink = fopen("entity_link.csv", "w");
-$hFileEntityProperty = fopen("entity_property.csv", "w");
+$hFileEntity = fopen('entity.csv', 'w');
+$hFileEntityLabel = fopen('entity_label.csv', 'w');
+$hFileEntityDescription = fopen('entity_description.csv', 'w');
+$hFileEntityAlias = fopen('entity_alias.csv', 'w');
+$hFileEntityLink = fopen('entity_link.csv', 'w');
+$hFileEntityProperty = fopen('entity_property.csv', 'w');

 
 $iCount = 0;
 
 
 $iCount = 0;
 


@@ -50,7 +50,7 @@ if ($hFile) {
             $sText = html_entity_decode(substr($sLine, 33, -8), ENT_COMPAT, 'UTF-8');
             $aArticle = json_decode($sText, true);
 
             $sText = html_entity_decode(substr($sLine, 33, -8), ENT_COMPAT, 'UTF-8');
             $aArticle = json_decode($sText, true);
 

-            if (array_diff(array_keys($aArticle), array("label", "description", "aliases", "links", "entity", "claims", "datatype")) != array()) {
+            if (array_diff(array_keys($aArticle), array('label', 'description', 'aliases', 'links', 'entity', 'claims', 'datatype')) != array()) {

                 // DEBUG
                 var_dump($sTitle);
                 var_dump(array_keys($aArticle));
                 // DEBUG
                 var_dump($sTitle);
                 var_dump(array_keys($aArticle));


@@ -67,7 +67,7 @@ if ($hFile) {
                 continue;
             }
 
                 continue;
             }
 

-            echo ".";
+            echo '.';

 
             fputcsv($hFileEntity, array($iID, $sTitle, $iPID, $iQID, @$aArticle['datatype']));
 
 
             fputcsv($hFileEntity, array($iID, $sTitle, $iPID, $iQID, @$aArticle['datatype']));
 


@@ -115,8 +115,21 @@ if ($hFile) {
                     } elseif ($aClaim['m'][2] == 'globecoordinate') {
                         //
                         if ($aClaim['m'][3]['globe'] != 'http://www.wikidata.org/entity/Q2') $bFail = true;
                     } 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";
+                        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'),";
+                         * echo $iID.",".$iPID.",null,null,ST_SetSRID(ST_MakePoint(".((float)$aClaim['m'][3]['longitude']);
+                         * echo ", ".((float)$aClaim['m'][3]['latitude'])."),4326));\n";
+                         */

                     } elseif ($aClaim['m'][2] == 'time') {
                         // TODO!
                         /*
                     } elseif ($aClaim['m'][2] == 'time') {
                         // TODO!
                         /*