Revision: 48632
Author: daniel
Date: 2009-03-20 13:27:29 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
include resource id in definition
Modified Paths:
--------------
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/schema/LocalConceptStoreSchema.java
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/store/builder/DatabaseLocalConceptStoreBuilder.java
Modified:
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/schema/LocalConceptStoreSchema.java
===================================================================
---
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/schema/LocalConceptStoreSchema.java
2009-03-20 12:00:38 UTC (rev 48631)
+++
trunk/WikiWord/WikiWord/src/main/java/de/brightbyte/wikiword/schema/LocalConceptStoreSchema.java
2009-03-20 13:27:29 UTC (rev 48632)
@@ -74,6 +74,7 @@
definitionTable = new EntityTable(this, "definition",
defaultTableAttributes);
definitionTable.addField( new ReferenceField(this, "concept",
"INT", null, true, KeyType.PRIMARY, "concept", "id", null ) );
+ definitionTable.addField( new ReferenceField(this, "resource",
"INT", null, true, KeyType.UNIQUE, "resource", "id", null ) );
definitionTable.addField( new DatabaseField(this, "definition",
getTextType(1024*8), null, true, null ) );
definitionTable.setAutomaticField(null);
addTable(definitionTable);
Modified:
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/store/builder/DatabaseLocalConceptStoreBuilder.java
===================================================================
---
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/store/builder/DatabaseLocalConceptStoreBuilder.java
2009-03-20 12:00:38 UTC (rev 48631)
+++
trunk/WikiWord/WikiWordBuilder/src/main/java/de/brightbyte/wikiword/store/builder/DatabaseLocalConceptStoreBuilder.java
2009-03-20 13:27:29 UTC (rev 48632)
@@ -198,7 +198,7 @@
protected void deleteDataFrom(int rcId, String op) throws
PersistenceException {
- deleteDataFrom(rcId, op, definitionTable, "concept",
aboutTable, "concept", "resource");
+ deleteDataFrom(rcId, op, definitionTable, "resource");
deleteDataFrom(rcId, op, linkTable, "resource");
deleteDataFrom(rcId, op, langlinkTable, "resource");
@@ -248,6 +248,7 @@
try {
if (conceptId<0) throw new
IllegalArgumentException("bad concept id "+conceptId);
+ definitionInserter.updateInt("resource", rcId);
definitionInserter.updateInt("concept", conceptId);
definitionInserter.updateString("definition",
clipString(rcId, definition, 1024 * 8, "definition text (concept {0})",
conceptId));
definitionInserter.updateRow();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
