Revision: 52533
Author:   daniel
Date:     2009-06-28 22:36:59 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
fixed test case

Modified Paths:
--------------
    
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
    
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
    
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
    
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/build-mappings.properties

Modified: 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
===================================================================
--- 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
        2009-06-28 22:33:37 UTC (rev 52532)
+++ 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/AbstractIntegratorApp.java
        2009-06-28 22:36:59 UTC (rev 52533)
@@ -391,6 +391,7 @@
                list.add( 
SqlScriptRunner.makeCommentSubstitutionMangler("wikiword_prefix", 
getConfiguredDataset().getDbPrefix()) );
                list.add( 
SqlScriptRunner.makeCommentSubstitutionMangler("wikiword_db", 
getConfiguredDatasetName()) );
                list.add( 
SqlScriptRunner.makeCommentSubstitutionMangler("wikiword_target_table", 
getTargetTableName()) );
+               list.add( 
SqlScriptRunner.makeCommentSubstitutionMangler("wikiword_mapping_table", 
getSourceDescriptor().getTweak("source-table", (String)null)) );
                
                return list;
        }

Modified: 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
===================================================================
--- 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
   2009-06-28 22:33:37 UTC (rev 52532)
+++ 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/FeatureSetSourceDescriptor.java
   2009-06-28 22:36:59 UTC (rev 52533)
@@ -102,7 +102,7 @@
        }
 
        public String getPropertySubjectNameField() {
-               return requireTweak("property-subject-name-field");
+               return getTweak("property-subject-name-field", null);
        }
 
        public boolean getSkipHeader() {

Modified: 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
===================================================================
--- 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
  2009-06-28 22:33:37 UTC (rev 52532)
+++ 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/best-mappings.properties
  2009-06-28 22:36:59 UTC (rev 52533)
@@ -3,4 +3,4 @@
 concept-id-field="concept"
 concept-name-field="concept_name"
 mapping-filter-field="weight"
-association-annotation-field="annotation"
\ No newline at end of file
+association-annotation-field=null
\ No newline at end of file

Modified: 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/build-mappings.properties
===================================================================
--- 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/build-mappings.properties
 2009-06-28 22:33:37 UTC (rev 52532)
+++ 
trunk/WikiWord/WikiWordIntegrator/src/main/java/de/brightbyte/wikiword/integrator/build-mappings.properties
 2009-06-28 22:36:59 UTC (rev 52533)
@@ -4,4 +4,4 @@
 concept-name-field="concept_name"
 mapping-filter-field="weight"
 association-weight-field="weight"
-association-annotation-field="annotation"
+association-annotation-field=null



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to