vienti-source-changes Mailing List for Vienti

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/vienti/vienti/source/se/biobanksregistersyd/vienti/datasources
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22941/source/se/biobanksregistersyd/vienti/datasources

Modified Files:
	DsRandomdata_RBBR.java 
Log Message:
Make the generation of files work again, though lots of tweaking can and
  should be done on the values and frequency of them. Lots of code copied
  from DsSympathy_RBBR.

Index: DsRandomdata_RBBR.java
===================================================================
RCS file: /cvsroot/vienti/vienti/source/se/biobanksregistersyd/vienti/datasources/DsRandomdata_RBBR.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17

--- DsRandomdata_RBBR.java	2 Dec 2006 22:28:59 -0000	1.16
+++ DsRandomdata_RBBR.java	2 Dec 2006 23:06:11 -0000	1.17
@@ -24,6 +24,11 @@
  ** liable for any use that may be made of the information contained herein.
  **
  ** $Log$
+ ** Revision 1.17  2006/12/02 23:06:11  jtorin
+ ** Make the generation of files work again, though lots of tweaking can and
+ **   should be done on the values and frequency of them. Lots of code copied
+ **   from DsSympathy_RBBR.
+ **
  ** Revision 1.16  2006/12/02 22:28:59  jtorin
  ** Code style fixes.
  **
@@ -98,16 +103,24 @@
 
 import se.biobanksregistersyd.vienti.CurrentContext;
 import se.biobanksregistersyd.vienti.ParameterException;
+import se.biobanksregistersyd.vienti.ParameterExceptionEnum;
+import se.biobanksregistersyd.vienti.Parameters;
 import se.biobanksregistersyd.vienti.datafiles.Datafile;
 import se.biobanksregistersyd.vienti.datafiles.DfXML_RBBR;
 import se.biobanksregistersyd.vienti.datafiles.GenerationException;
 
 /**
- * A class that generates random data in the RBBR10 format.
+ * A class that generates random data in the RBBR02 format.
  * 
  * @author johant
  */
 public class DsRandomdata_RBBR extends DsRandomdata {
+    /** Updated by CVS. Don't edit manually. */
+    private static final String CVSREVISION = "$Revision$";
+
+    /** Class revision from CVS as a string. */
+    private String revision = null;
+
     /** Current classname. 
      * "se.biobanksregistersyd.vienti.datasource.DsRandomdata_RBBR" */
     private static final String CLASSNAME
@@ -122,6 +135,17 @@
     private final String companionDatafile
         = "se.biobanksregistersyd.vienti.datafiles.DfXML_RBBR";
 
+    /** The id of the sample collection. See note in constructor. */
+    private String sampleCollectionId = null;
+
+    /**
+     * Describes if the sample collection is complete (true) or partial (false).
+     */
+    private Boolean complete = null;
+
+    /** The number of samples written to the <code>Datafile</code>. */
+    private int numberOfExportedSamples = 0;
+
     /**
      * Creates a <code>DsRandomdata_RBBR</code> object and loads neccesary
      * properties to set it up correctly. Constructors in subclasses should call
@@ -131,8 +155,13 @@
      * to construct names of properties. <p/> The following properties may be
      * loaded when this class is instantiated. <p/>
      * <dl>
-     * <dt> (None)
-     * <dd>
+     * <dt> &lt;prefix&gt;.&lt;classname&gt;.sampleCollection
+     * <dd> A unique identifier for a sample collection (allotted by RBBR in
+     * Sweden). This should preferably be choosen so it does not collide with
+     * an existing real sample collection.
+     * <dt> &lt;prefix&gt;.&lt;classname&gt;.complete
+     * <dd> (optional) A specifier that tells if the transfer is complete or
+     * partial.
      * </dl>
      * 
      * @param datafileIn
@@ -152,6 +181,31 @@
     public DsRandomdata_RBBR(final Datafile datafileIn)
             throws GatheringException, ParameterException {
         super(datafileIn);
+
+        // Elicit the revisionnumber from the CVS revision keyword string.
+        revision = CVSREVISION.substring("$Revision: ".length());
+        revision = revision.substring(0, revision.length() - 2);
+
+        String tmpPropertyName, tmp;
+
+        tmpPropertyName = getPropertyPrefix() + "." + CLASSNAME
+                + ".sampleCollectionId";
+        sampleCollectionId = Parameters.getProperty(tmpPropertyName);
+        if (sampleCollectionId == null) {
+            throw new ParameterException(
+                    ParameterExceptionEnum.PROPERTY_NOT_SPECIFIED,
+                    "Property name: " + tmpPropertyName);
+        }
+
+        tmpPropertyName = getPropertyPrefix() + "." + CLASSNAME + ".complete";
+        tmp = Parameters.getProperty(tmpPropertyName);
+        if (tmp == null) {
+            // Default value is false.
+            complete = Boolean.FALSE;
+        } else {
+            complete = Boolean.valueOf(tmp);
+        }
+        
     }
 
     /**
@@ -198,6 +252,13 @@
 
         DfXML_RBBR df = (DfXML_RBBR) getDatafile();
 
+        df.open();
+        String comment = "Information created artificially by '" + CLASSNAME
+            + "', revision " + revision + ".";
+        // TODO Create or load start and end date?
+        df.writeHeader(comment, "fake start date", "fake end date");
+        df.writeStartSampleCollection(sampleCollectionId, complete);
+
         Hashtable dataset = new Hashtable();
 
         logger.info("Quantity: " + getQuantity());
@@ -286,14 +347,16 @@
             dataset.put("rbbr:biobankValues", biobankvalues);
 
             df.writeEntry(dataset);
+            numberOfExportedSamples += 1;
 
         }
 
-        // xmlg.writeEndSampleCollection();
-        // xmlg.writeFooter();
-
-        logger.info("Random data generation ok");
+        df.writeEndSampleCollection();
+        df.writeFooter();
+        logger.info("Number of created sample records: "
+                + Integer.toString(numberOfExportedSamples));
         df.close();
+
     }
 
     /**





vienti-source-changes Mailing List for Vienti

vienti-source-changes — Commit messages for Vienti