compatibility for import

Author: jprante

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>org.xbib.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-knapsack</artifactId>
-    <version>1.0.0.RC1.1</version>
+    <version>1.0.0.RC1.2</version>
 
     <packaging>jar</packaging>
 
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
-            <version>1.3</version>
+            <version>1.1</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/org/xbib/elasticsearch/action/RestImportAction.java

@@ -201,13 +201,14 @@ public void run() {
                 String lastCoord = null;
                 while ((packet = session.read()) != null) {
                     String[] entry = KnapsackPacket.decodeName(packet.name());
-                    if (entry.length != 4) {
+                    if (entry.length < 2) {
                         throw new ElasticsearchIllegalStateException("archive entry too short, can't import");
                     }
                     String index = entry[0];
                     String type = entry[1];
-                    String id = entry[2];
-                    String field = entry[3];
+                    // entry length != 4 ? older knapsack format
+                    String id = entry.length > 2 ? entry[2] : null;
+                    String field = entry.length > 3 ? entry[3] : "_source";
                     if ("_settings".equals(type)) {
                         index = mapIndex(index);
                         String settings;