Changeset 2152

Timestamp:

Apr 6, 2006, 3:05:12 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixed export function so it supports ReporterScore?

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Metadata.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/ReporterScore.java (modified) (1 diff)
• www/common/export/submit_export.jsp (modified) (6 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -152 +152 @@
       }
     }
+    guiContexts.add(new GuiContext(Item.REPORTERSCORE, GuiContext.Type.LIST));
   }
 }

trunk/src/core/net/sf/basedb/core/Metadata.java

@@ -245 +245 @@
     org.hibernate.Session session = dc.getHibernateSession();
     Object value = null;
-    BasicData data = null;
+    Object data = null;
     if (item instanceof BasicItem)
     {
@@ -254 +254 @@
       data = (BasicData)item;
     }
+    else if (item instanceof ReporterScore)
+    {
+      data = ((ReporterScore)item).getData();
+    }
     else
     {
-      throw new AssertionError("Item: " + item + " is not a BasicItem or BasicData");
+      throw new AssertionError("Item: " + item + " is not a BasicItem, BasicData or ReporterScore");
     }
     
@@ -265 +269 @@
         if (value instanceof BasicData)
         {
-          data = (BasicData)value;
-          Class<? extends BasicData> dataClass = null;
+          BasicData bData = (BasicData)value;
+          data = value;
+          Class<?> dataClass = null;
           // If it is a proxy we must reload it using the current session
           if (data instanceof org.hibernate.proxy.HibernateProxy)
           {
             dataClass = org.hibernate.proxy.HibernateProxyHelper.getClassWithoutInitializingProxy(data);
-            data = HibernateUtil.loadData(session, dataClass, data.getId());
+            data = HibernateUtil.loadData(session, dataClass, bData.getId());
           }
           else

trunk/src/core/net/sf/basedb/core/ReporterScore.java

@@ -66 +66 @@
   }
   
+  ReporterListScoreData getData()
+  {
+    return data;
+  }
+  
   /**
     Get the reporter. 

trunk/www/common/export/submit_export.jsp

@@ -41 +41 @@
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.DataQuery"
+  import="net.sf.basedb.core.ReporterScoreQuery"
   import="net.sf.basedb.core.Metadata"
   import="net.sf.basedb.core.Path"
@@ -53 +54 @@
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.core.data.BasicData"
+  import="net.sf.basedb.core.data.ReporterListScoreData"
   import="net.sf.basedb.util.FileUtil"
   import="net.sf.basedb.clients.web.Base"
@@ -132 +134 @@
     entityName = rba.getRawDataType().getEntityName();
   }
+  if (itemType == Item.REPORTERSCORE)
+  {
+    entityName = ReporterListScoreData.class.getName();
+  }
   
   final Metadata metadata = entityName == null ? 
@@ -234 +240 @@
   
   boolean basicItems = false;
+  boolean basicDatas = false;
   int exportedItems = 0;
   do
@@ -245 +252 @@
     {
       result = ((DataQuery)query).iterate(dc);
-      basicItems = false;
+      basicDatas = true;
+    }
+    else if (query instanceof ReporterScoreQuery)
+    {
+      result = ((ReporterScoreQuery)query).iterate(dc);
     }
     exportedItems = 0;
@@ -252 +263 @@
       exportedItems++;
       Object item = result.next();
-      int id = basicItems ? ((BasicItem)item).getId() : ((BasicData)item).getId();
+      int id = 0;
+      if (basicItems) 
+      {
+        id = ((BasicItem)item).getId();
+      }
+      else if (basicDatas)
+      {
+        id =  ((BasicData)item).getId();
+      }
       AnnotationSet as = null;
       org.jdom.Element itemElement = null;