Index: trunk/extensions/Wikidata/Database scripts/Convenience/Create wikidata.php |
— | — | @@ -14,12 +14,13 @@ |
15 | 15 | $currentdir = dirname( __FILE__ ); |
16 | 16 | chdir( $IP ); |
17 | 17 | |
18 | | -ini_set( 'include_path', ".$sepIP$sep$IP/extensions/Wikidata/OmegaWiki$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); |
| 18 | +ini_set( 'include_path', ".$sep$IP/extensions/Wikidata/OmegaWiki$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); |
19 | 19 | |
20 | 20 | require_once( "Defines.php"); |
21 | 21 | require_once( "ProfilerStub.php"); |
22 | 22 | require_once( "LocalSettings.php"); |
23 | 23 | require_once( "Setup.php"); |
| 24 | +ini_set( 'include_path', ".$sep$IP/extensions/Wikidata/OmegaWiki$sep$IP/includes$sep$IP/languages$sep$IP/maintenance" ); |
24 | 25 | require_once( "Attribute.php" ); |
25 | 26 | require_once( "Transaction.php"); |
26 | 27 | require_once( "WikiDataBootstrappedMeanings.php"); |
— | — | @@ -249,4 +250,4 @@ |
250 | 251 | $wdDatabase->close(); |
251 | 252 | |
252 | 253 | |
253 | | -?> |
\ No newline at end of file |
| 254 | +?> |
Index: trunk/extensions/Wikidata/Database scripts/Convenience/wikidataSourceTables.sql |
— | — | @@ -56,6 +56,7 @@ |
57 | 57 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; |
58 | 58 | |
59 | 59 | CREATE TABLE /*$wgWDprefix*/collection_contents ( |
| 60 | +`object_id` int(11) default NULL, |
60 | 61 | `collection_id` int(10) NOT NULL default '0', |
61 | 62 | `member_mid` int(10) NOT NULL default '0', |
62 | 63 | `internal_member_id` varchar(255) default NULL, |
Index: trunk/extensions/Wikidata/OmegaWiki/WikiDataAPI.php |
— | — | @@ -1256,7 +1256,7 @@ |
1257 | 1257 | member_mid=$dm_id, |
1258 | 1258 | add_transaction_id=$add_transaction_id |
1259 | 1259 | "; |
1260 | | - $dbr->query($sql); |
| 1260 | + $result=$dbr->query($sql); |
1261 | 1261 | } |
1262 | 1262 | |
1263 | 1263 | /**read a ConceptMapping from the database |