Changeset 3384

Timestamp:

May 25, 2007, 12:59:22 PM (16 years ago)

Author:

Johan Enell

Message:

corrected some backward compability errors

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (5 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -366 +366 @@
         dc = sc.newDbControl();
         File f = (File) request.getParameterValue(fileParameter.getName());
-        PluginConfiguration pc = PluginConfiguration.getById(dc, configuration.getId());
         if (f != null)
         {
           f = File.getById(dc, f.getId());
-          AnyToAny ata = AnyToAny.getNewOrExisting(dc, pc, "Configurationfile", f, true);
-          if (!ata.isInDatabase())
-          {
-            dc.saveItem(ata);
-          }
           
           getManualConfigureParameters();
@@ -410 +404 @@
         storeValue(configuration, request, usedFieldsParameter);
         storeValue(configuration, request, jobParametersParameter);
-        // test the xml in the jobParameters paramere
-        getJobParameters();
+        // test the xml in the jobParameters parameres
+        getJobParametersFromXML(String.valueOf(configuration.getValue(jobParametersParameter.getName())));
+        
         response.setDone("Plugin configuration done.");
       }
@@ -738 +733 @@
   
   
+  @SuppressWarnings("unchecked")
+  private List<PluginParameter<?>> getJobParametersFromXML(String xml)
+  {
+    try
+    {
+      List<PluginParameter<?>> p = new ArrayList<PluginParameter<?>>();
+      String doctype = "<!DOCTYPE jobparameters SYSTEM \"base1-plugin-configuration-file.dtd\">";
+      Document doc = XMLUtil.getValidatedXml(doctype+xml, dtdFile);
+      Iterator<Element> it = doc.getDescendants(new Filter()
+      {
+        public boolean matches(Object o)
+        {
+          if (o instanceof Element)
+          {
+            Element e = (Element) o;
+            return e.getName().equals("parameter");
+          }
+          return false;
+        }
+      });
+      while (it.hasNext())
+      {
+        Element e = it.next();
+        JobParameter jp = new JobParameter(e);
+        p.add(jp.getPluginParameter());
+      }
+      return p;
+    }
+    catch (JDOMException e1)
+    {
+      throw new BaseException(e1.getCause());
+    }
+    catch (IOException e1)
+    {
+      throw new BaseException(e1);
+    }
+  }
+  
+  
   /**
    * Creates a boolean from a string.
@@ -966 +1000 @@
     }
     jobParameters = new ArrayList<PluginParameter<?>>();
-    
-    try
-    {
-      String doctype = "<!DOCTYPE jobparameters SYSTEM \"base1-plugin-configuration-file.dtd\">";
-      Document doc = XMLUtil.getValidatedXml(doctype+configuration.getValue(jobParametersParameter.getName()).toString(), dtdFile);
-      Iterator<Element> it = doc.getDescendants(new Filter()
-      {
-        public boolean matches(Object o)
-        {
-          if (o instanceof Element)
-          {
-            Element e = (Element) o;
-            return e.getName().equals("parameter");
-          }
-          return false;
-        }
-      });
-      while (it.hasNext())
-      {
-        Element e = it.next();
-        JobParameter jp = new JobParameter(e);
-        jobParameters.add(jp.getPluginParameter());
-      }
-    }
-    catch (JDOMException e)
-    {
-      throw new BaseException(e.getCause());
-    }
-    catch (IOException e)
-    {
-      throw new BaseException(e.getCause());
-    }
-    
+        
     DbControl dc = null;
     try
     {
       dc = sc.newDbControl();
-      Experiment experiment = super.getCurrentExperiment(dc);
+      Experiment experiment = getCurrentExperiment(dc);
       String homeDirectoryPath = "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
       Directory homeDirectory = experiment.getDirectory();
@@ -1024 +1026 @@
         new PathParameterType(Path.Type.DIRECTORY, homeDirectoryPath, true));
       jobParameters.add(pluginDirectoryParameter);
+      
+      Object xml = configuration.getValue(jobParametersParameter.getName());
+      // To make the plugin compatible with older configurations
+      if (xml == null)
+      {
+        Object o = configuration.getValue(fileParameter.getName());
+        if (o != null) 
+        {
+          File f = File.getById(dc, ((File) o).getId());
+          xml = getParametersFromBaseFile(f).get(jobParametersParameter.getName());
+        }
+        else
+        {
+          throw new BaseException("Cant find the jobparameter specification. Reconfigure the plugin.");
+        }
+      }
+      jobParameters.addAll(getJobParametersFromXML(xml.toString()));
+    }
+    catch (IOException e)
+    {
+      throw new BaseException(e);
     }
     finally