Changeset 6470

Timestamp:

Nov 4, 2021, 11:59:33 AM (15 months ago)

Author:

Nicklas Nordborg

Message:

References #1348: Improvments to the Map external data wizard

The wizard should now be able to convert files that only has single column.

File:

• extensions/net.sf.basedb.reggie/branches/4.33-stable/src/net/sf/basedb/reggie/servlet/ExportServlet.java (modified) (5 diffs)

extensions/net.sf.basedb.reggie/branches/4.33-stable/src/net/sf/basedb/reggie/servlet/ExportServlet.java

@@ -606 +606 @@
           long parsedCharacters = header.length()+1;
           String[] dataIn = header.split("\t", 2);
-          if (dataIn.length != 2) 
-          {
-            throw new IOException("The file need at least 2 header columns");
-          }
+          if (dataIn.length == 2) outColumns.add(new RestOfData(dataIn[1]));
         
           int lastCol = outColumns.size();
-          Object[] headerOut = new Object[lastCol+1];
+          Object[] headerOut = new Object[lastCol];
           for (int colNo = 0; colNo < lastCol; colNo++)
           {
             headerOut[colNo] = outColumns.get(colNo).getHeader();
           }
-          headerOut[lastCol] = dataIn[1];
         
           int lineOut = 0;
@@ -631 +627 @@
             progress.display((int)(100*parsedCharacters / totalBytes), "Working... " + inputLine.lineNo + " lines parsed so far...");
             
-            dataIn = data.split("\t", 2);
-            if (dataIn.length != 2) 
-            {
-              throw new IOException("On line " + inputLine.lineNo + ": The file need at least 2 data columns");
-            }
-
-            inputLine.fromId = Values.getStringOrNull(dataIn[0]);
+            inputLine.cols = data.split("\t", 2);
+            inputLine.fromId = Values.getStringOrNull(inputLine.cols[0]);
             if (inputLine.fromId == null)
             {
@@ -660 +651 @@
                 output[colNo] = outColumns.get(colNo).convert(inputLine);
               }
-              output[lastCol] = dataIn[1];
               dataOut.add(output);
               lineOut++;
@@ -1486 +1476 @@
   {
     int lineNo;
+    String[] cols;
     String fromId;
     BioSource patient;
@@ -1696 +1687 @@
   
   /**
+    Get the rest of the data on the line.
+    @since 4.33.4
+  */
+  static class RestOfData
+    extends OutputColumn
+  {
+    
+    RestOfData(String restHeader)
+    {
+      super(restHeader);
+    }
+    
+    @Override
+    public String convert(InputLine ctx) 
+    {
+      return ctx.cols.length == 2 ? ctx.cols[1] : null;
+    }
+  }
+  
+  /**
     Get the external (release) ID from the patient.
   */