Author: schorlet Date: 2010-01-19 14:33:28 +0100 (Tue, 19 Jan 2010) New Revision: 361 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml Log: change dynamicField named "*_s" from type "string" to type "text_fr" because vradi 0.0.3 need it fix bug in ImportTask: the objectVersion was never assigned to the wikitty Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-01-18 16:55:35 UTC (rev 360) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-01-19 13:33:28 UTC (rev 361) @@ -561,7 +561,6 @@ int eventType = xpp.getEventType(); do { - String objectVersion = null; if (eventType == xpp.START_DOCUMENT) { log.info("start XML import at " + new Date()); } else if (eventType == xpp.END_DOCUMENT) { @@ -577,9 +576,10 @@ ext = new WikittyExtension(extName, version, requires, new LinkedHashMap<String, FieldType>()); } else if ("object".equals(name)) { String id = xpp.getAttributeValue(null, "id"); - objectVersion = xpp.getAttributeValue(null, "version"); + String objectVersion = xpp.getAttributeValue(null, "version"); String extensions = xpp.getAttributeValue(null, "extensions"); w = new Wikitty(id); + w.setVersion(objectVersion); String[] extensionList = extensions.split(","); for (String extId : extensionList) { WikittyExtension e = batchUpdate.getExtension(extId); @@ -592,7 +592,6 @@ batchUpdate.addExtension(ext); ext = null; } else if ("object".equals(name)) { - w.setVersion(objectVersion); batchUpdate.addWikitty(w); w = null; } else if (ext != null && "field".equals(name)) { Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-01-18 16:55:35 UTC (rev 360) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-01-19 13:33:28 UTC (rev 361) @@ -295,7 +295,7 @@ <copyField source="*_dt" dest="text"/> <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="text_fr" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_t" type="text_fr" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/> @@ -322,4 +322,4 @@ <!-- SolrQueryParser configuration: defaultOperator="AND|OR" --> <solrQueryParser defaultOperator="AND"/> -</schema> \ No newline at end of file +</schema>