Changeset 1407 for webservices/net.sf.basedb.examples/trunk/src

Timestamp:

Oct 18, 2011, 2:50:36 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #327: Update web service examples to BASE 3

Location:

webservices/net.sf.basedb.examples/trunk

Files:

• . (modified) (1 prop)
• src/net/sf/basedb/ws/example/Main.java (modified) (5 diffs)

webservices/net.sf.basedb.examples/trunk

@@ -3 +3 @@
 build
 dist
+build.properties
+.settings

@@ -3 +3 @@
 build
 dist
+build.properties
+.settings

webservices/net.sf.basedb.examples/trunk/src/net/sf/basedb/ws/example/Main.java

@@ -4 +4 @@
   Copyright (C) Authors contributing to this file.
 
-  This file is part of BASE - BioArray Software Environment.
-  Available at http://base.thep.lu.se/
-
-  BASE is free software; you can redistribute it and/or
+  This is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
+  as published by the Free Software Foundation; either version 3
   of the License, or (at your option) any later version.
-
-  BASE is distributed in the hope that it will be useful,
+  
+  The software is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-
+  
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA  02111-1307, USA.
+  along with BASE. If not, see <http://www.gnu.org/licenses/>.
 */
 package net.sf.basedb.ws.example;
@@ -35 +30 @@
 import net.sf.basedb.info.DataFileTypeInfo;
 import net.sf.basedb.info.ExperimentInfo;
+import net.sf.basedb.info.FileInfo;
+import net.sf.basedb.info.FileSetMemberInfo;
 import net.sf.basedb.info.ProjectInfo;
 import net.sf.basedb.info.QueryOptions;
@@ -254 +251 @@
     throws AxisFault
   {
-    DataFileTypeInfo[] files = rc.getDataFileTypes(info.getId(), new QueryOptions());
+    FileSetMemberInfo[] files = rc.getDataFiles(info.getId(), new QueryOptions());
     if (files == null || files.length == 0)
     {
@@ -261 +258 @@
     else
     {
-      for (DataFileTypeInfo fileType : files)
-      {
-        System.out.print("   " + fileType.getName());
+      for (FileSetMemberInfo member : files)
+      {
+        DataFileTypeInfo fileType = member.getDataFileTypeInfo();
+        FileInfo file = member.getFileInfo();
+        
+        System.out.println("   " + fileType.getName() + ": " + 
+          file.getName() + " [id=" + file.getId() + "] " + file.getSize() + " bytes");
         if (downloadDir != null)
         {
-          String extension = fileType.getExtension() == null ? "" : "." + fileType.getExtension();
-          File downloadTo = new File(downloadDir, info.getName() + extension);
+          File downloadTo = new File(downloadDir, info.getName() + "." + file.getName());
           try
           {
@@ -275 +275 @@
             out.close();
             in.close();
-            System.out.print("; Download --> " + downloadTo);
+            System.out.print("   Download --> " + downloadTo);
           }
           catch (IOException ex)
           {
-            System.out.print("; Download failed: " + ex.getMessage());
+            System.out.print("   Download failed: " + ex.getMessage());
           }
         }

@@ -3 +3 @@
 build
 dist
+build.properties
+.settings