From 71ce2a93dae7b684a44449c446733a300babf457 Mon Sep 17 00:00:00 2001 From: Manuele Simi Date: Fri, 28 Aug 2009 17:58:13 +0000 Subject: [PATCH] several major fixings on PTs and XQuery git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/information-system/gCubeIS/Collector@14849 82a268e6-3cf1-43bd-a215-b396298e98cf --- CHANGELOG | 8 ++++++-- etc/deploy-jndi-config.xml | 2 +- schema/XMLCollectionAccess.wsdl | 9 +-------- .../collector/impl/porttypes/XQueryAccess.java | 2 +- .../collector/impl/xmlstorage/backup/Scheduler.java | 2 +- .../collector/impl/xmlstorage/exist/State.java | 2 +- .../collector/stubs/testsuite/XQueryExecuteTester.java | 8 ++++++++ 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 98d224c..ecd8d60 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,12 @@ v. 2.0.0 (30-08-2009) + * test-suite + * Data e Query specialized managers + * scheduled backups + * remote connect/shutdown + * remote backup/restore * portTypes reorganization - * internal refactoring - * hot and cold backups + * internal refactoring v. 1.0.0 (10-01-2009) * gCore refactoring diff --git a/etc/deploy-jndi-config.xml b/etc/deploy-jndi-config.xml index 863ba18..bd4366a 100755 --- a/etc/deploy-jndi-config.xml +++ b/etc/deploy-jndi-config.xml @@ -16,7 +16,7 @@ - - - - - - - - - + \ No newline at end of file diff --git a/src/org/gcube/informationsystem/collector/impl/porttypes/XQueryAccess.java b/src/org/gcube/informationsystem/collector/impl/porttypes/XQueryAccess.java index 4f820bb..d5ef76e 100644 --- a/src/org/gcube/informationsystem/collector/impl/porttypes/XQueryAccess.java +++ b/src/org/gcube/informationsystem/collector/impl/porttypes/XQueryAccess.java @@ -76,7 +76,7 @@ public class XQueryAccess extends GCUBEPortType { dataset.append("<" + rootElement + ">\n"); for (int i = 0; i < (int) result.getSize(); i++) { XMLResource xmlres = (XMLResource) result.getResource((long) i); - dataset.append("<"+recordElement+">\n" + xmlres.getContent() + "\n\n" + xmlres.getContent() + "\n\n"); } dataset.append(""); return dataset.toString(); diff --git a/src/org/gcube/informationsystem/collector/impl/xmlstorage/backup/Scheduler.java b/src/org/gcube/informationsystem/collector/impl/xmlstorage/backup/Scheduler.java index 760f6e8..e4159e3 100644 --- a/src/org/gcube/informationsystem/collector/impl/xmlstorage/backup/Scheduler.java +++ b/src/org/gcube/informationsystem/collector/impl/xmlstorage/backup/Scheduler.java @@ -21,7 +21,7 @@ public abstract class Scheduler implements Runnable { */ public Scheduler(int intervalInHours) { this.intervalInMS = intervalInHours * 3600 * 1000; - logger.info("Scheduler will work every : " + intervalInHours + " hour(s)"); + logger.info("Scheduler will work every " + intervalInHours + " hour(s)"); } public Scheduler() {} diff --git a/src/org/gcube/informationsystem/collector/impl/xmlstorage/exist/State.java b/src/org/gcube/informationsystem/collector/impl/xmlstorage/exist/State.java index aba95aa..92f1926 100755 --- a/src/org/gcube/informationsystem/collector/impl/xmlstorage/exist/State.java +++ b/src/org/gcube/informationsystem/collector/impl/xmlstorage/exist/State.java @@ -65,7 +65,7 @@ public class State { logger.info("Initialising the sweeper..."); // start the sweeper to periodically cleanup the storage and some data structures if (State.sweeperT == null) { - Sweeper sweeper = new Sweeper(Long.valueOf((String) ICServiceContext.getContext().getProperty("sweeperIntervalinMillis", true)), Long.valueOf((String) ICServiceContext.getContext() + Sweeper sweeper = new Sweeper(Long.valueOf((String) ICServiceContext.getContext().getProperty("sweeperIntervalInMillis", true)), Long.valueOf((String) ICServiceContext.getContext() .getProperty("resourceExpirationTimeInMillis", true))); State.sweeperT = new Thread(sweeper); State.sweeperT.start(); diff --git a/src/org/gcube/informationsystem/collector/stubs/testsuite/XQueryExecuteTester.java b/src/org/gcube/informationsystem/collector/stubs/testsuite/XQueryExecuteTester.java index b16d0c5..884ae99 100644 --- a/src/org/gcube/informationsystem/collector/stubs/testsuite/XQueryExecuteTester.java +++ b/src/org/gcube/informationsystem/collector/stubs/testsuite/XQueryExecuteTester.java @@ -7,6 +7,8 @@ import java.io.FileReader; import java.io.IOException; import java.net.URL; import java.rmi.RemoteException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.gcube.common.core.contexts.GCUBERemotePortTypeContext; import org.gcube.common.core.scope.GCUBEScope; @@ -59,6 +61,12 @@ public class XQueryExecuteTester { logger.info("Number of returned records: " + response.getSize()); logger.info("Dataset: \n" + response.getDataset()); + Pattern p = Pattern.compile("(.*?)", Pattern.DOTALL); + Matcher m = p.matcher(response.getDataset()); + while (m.find()) { + logger.debug(m.group(1)); + } + } catch (XQueryFaultType e) { logger.error("XQuery Fault Error received", e); } catch (RemoteException e) {