changes propagated from Provenance.App entry.

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@228 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/src/org/vamsas/objects/utils/AppDataReference.java b/src/org/vamsas/objects/utils/AppDataReference.java
index 50dc96b..414c8da 100644 (file)
--- a/src/org/vamsas/objects/utils/AppDataReference.java
+++ b/src/org/vamsas/objects/utils/AppDataReference.java
@@ -98,8 +98,8 @@ public class AppDataReference {
    */
   static public boolean equals(ApplicationData p, ClientHandle c) {
     if (
-        ((c.getClientUrn()==null) || p.getUrn().equals(c.getClientUrn()))
-        &&
+        //((c.getClientUrn()==null) || p.getUrn().equals(c.getClientUrn()))
+        //&&
         (p.getName().equals(c.getClientName()))
         &&
         ((c.getVersion()==null) || (p.getVersion().equals(c.getVersion())))
@@ -146,13 +146,14 @@ public class AppDataReference {
    */
   public static String uniqueAppDataReference(VamsasDocument dest,String base) {
     String urn = new String(base);    
+    
     for (int i=0, j=dest.getApplicationDataCount(); i<j; i++) {
       ApplicationData o = dest.getApplicationData()[i];
       // ensure new urn is really unique
       int v = 1;
-      while (o.getUrn().equals(urn)) {
+      // TODO: while (o.getUrn().equals(urn)) {
         urn = base+"/"+v++;      
-      } 
+      //} 
     }
     return urn;
   }

diff --git a/src/org/vamsas/objects/utils/ProvenanceStuff.java b/src/org/vamsas/objects/utils/ProvenanceStuff.java
index d101d9d..2e813f7 100644 (file)
--- a/src/org/vamsas/objects/utils/ProvenanceStuff.java
+++ b/src/org/vamsas/objects/utils/ProvenanceStuff.java
@@ -15,14 +15,16 @@ public class ProvenanceStuff {
   static Log log = LogFactory.getLog(ProvenanceStuff.class);
 
   /**
+   * @param app TODO
    * @param action
    *          text for action entry
    * @return new Provenance entry for ArchiveWriter created docs.
    * TODO: Verify and move to SimpleClient class for provenance handling
    */
-  public static Entry newProvenanceEntry(String user, String action) { 
+  public static Entry newProvenanceEntry(String app, String user, String action) { 
     log.debug("Adding ProvenanceEntry("+user+","+action+")");
     Entry e = new Entry();
+    e.setApp(app);
     e.setAction(action);
     e.setUser(user);
     e.setDate(new org.exolab.castor.types.Date(new Date()));
@@ -34,7 +36,10 @@ public class ProvenanceStuff {
     return list;
   }
   public static Provenance newProvenance(String user, String action) {
-    return newProvenance(ProvenanceStuff.newProvenanceEntry(user, action));
+    return newProvenance(ProvenanceStuff.newProvenanceEntry("vamsasApp:ExampleVamsasClient/alpha", user, action));
+  }
+  public static Provenance newProvenance(String app, String user, String action) {
+    return newProvenance(ProvenanceStuff.newProvenanceEntry(app, user, action));
   }
 
 }