Changeset 2165

Timestamp:

Apr 18, 2006, 12:27:06 PM (17 years ago)

Author:

Martin Svensson

Message:

Change the export format for helptexts

Location:

trunk/src/core/net/sf/basedb

Files:

• core/dtd/helpfile.dtd (modified) (2 diffs)
• plugins/HelpExporter.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/dtd/helpfile.dtd

@@ -1 +1 @@
 <!--
-  $Id: helpexport.dtd,2004/07/28 12:30:49 nicklas Exp $
+  $Id: helpfile.dtd,2004/07/28 12:30:49 nicklas Exp $
 
   BioArray Software Environment (BASE) - http://base.thep.lu.se/
@@ -22 +22 @@
   Boston, MA  02111-1307, USA.
 -->
-<!ELEMENT helpexport (helpitem*) >
+<!ELEMENT helptexts (helpitem*)>
+<!ATTLIST helptexts
+  clientExternalID CDATA #REQUIRED
+> 
 
-<!ELEMENT helpitem (property)>
+<!ELEMENT helpitem (name,description)>
 <!ATTLIST helpitem
- id ID #REQUIRED
+  externalID CDATA #REQUIRED
 >
 
-<!ELEMENT property EMPTY >
-<!ATTLIST property
-  version CDATA #REQUIRED
-  name CDATA #REQUIRED
-  description CDATA #REQUIRED
-  clientid CDATA #REQUIRED
-  externalid CDATA #REQUIRED
->
+<!ELEMENT name (#CDATA)>
+<!ELEMENT description (#CDATA)>

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

@@ -274 +274 @@
       Writer helpExportStream = new OutputStreamWriter(file.getUploadStream(false), "UTF-8");
       helpExportStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-      xmlOut.output(new DocType("helpexport", "helpfile.dtd"), helpExportStream);
-      helpExportStream.write("\n<helpexport>\n");
+      xmlOut.output(new DocType("helptexts", "helpfile.dtd"), helpExportStream);
+      Element helpRoot = new Element("helptexts");
+      helpRoot.setAttribute("clientExternalID", client.getExternalId());
       
       //Transform the helpitems to XML elements
@@ -294 +295 @@
           exportedHelpItems++;
           Help helpItem = (Help)result.next();
-          int helpId = helpItem.getId();
           Element newHelpElement = new Element("helpitem");
-          newHelpElement.setAttribute("id", "help_" + helpId);
+          newHelpElement.setAttribute("externalID", helpItem.getExternalId());
           
-          //Add the helpitem's properties to the helpitem element
-          Element property = new Element("property");
-          property.setAttribute("version", helpItem.getVersion() + "");
-          property.setAttribute("name", helpItem.getName());
-          property.setAttribute("description", helpItem.getDescription());
-          property.setAttribute("clientid", helpItem.getClient().getId() + "");
-          property.setAttribute("externalid", helpItem.getExternalId());
-          newHelpElement.addContent(property);
+          Element name = new Element("name");
+          Element description = new Element("description");
           
-          xmlOut.output(newHelpElement, helpExportStream);
-          helpExportStream.write("\n");         
+          name.setText(helpItem.getName());
+          description.setText(helpItem.getDescription());
+          
+          newHelpElement.addContent(name);
+          newHelpElement.addContent(description);
+          
+          helpRoot.addContent(newHelpElement);
           progress.display(percentDone,"");
         }
@@ -320 +319 @@
       
       //Finish the XML document, close the stream and commit to DB
-      helpExportStream.write("</helpexport>");
+      xmlOut.output(helpRoot, helpExportStream);
       helpExportStream.flush();
       helpExportStream.close();
@@ -336 +335 @@
   }
   
-  public int getPercentPerItem(ItemQuery<Help> query, DbControl dc)
+  private int getPercentPerItem(ItemQuery<Help> query, DbControl dc)
   {
     query.setReturnTotalCount(true);
     query.setFirstResult(0);
     query.setMaxResults(0);
-    int nrOfItem = (query.iterate(dc).getTotalCount());   
-    return (100/nrOfItem);
+    int nrOfItem = (query.iterate(dc).getTotalCount()); 
+    if (nrOfItem > 0) 
+    {
+      return (100/nrOfItem);
+    }
+    else
+    {
+      return 100;
+    }
   }
 }