1 files changed, 69 insertions, 75 deletions
diff --git a/petascope/src/petascope/wcps/server/core/CoverageIterator.java b/petascope/src/petascope/wcps/server/core/CoverageIterator.java
index 164f0ff..effb55a 100644
--- a/petascope/src/petascope/wcps/server/core/CoverageIterator.java
+++ b/petascope/src/petascope/wcps/server/core/CoverageIterator.java
@@ -14,82 +14,76 @@
  * You should have received a copy of the GNU General Public License
  * along with rasdaman community.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Peter Baumann /
- rasdaman GmbH.
+ * Copyright 2003 - 2010 Peter Baumann / rasdaman GmbH.
  *
  * For more information please see <http://www.rasdaman.org>
  * or contact Peter Baumann via <baumann@rasdaman.com>.
  */
-package petascope.wcps.server.core;
-
-import petascope.wcps.server.exceptions.ResourceException;
-import petascope.wcps.server.exceptions.WCPSException;
-import org.w3c.dom.*;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class CoverageIterator implements IRasNode {
-
-    private List<String> coverageNames;
-    private String iteratorName;
-    private boolean dynamic = false;    // created from a Construct Coverage expr?
-
-    public CoverageIterator(Node x, XmlQuery xq) throws WCPSException {
-        IDynamicMetadataSource source = xq.getMetadataSource();
-        coverageNames = new ArrayList<String>();
-        if (!x.getNodeName().equals("coverageIterator")) {
-            throw new WCPSException("Invalid cast from " + x.getNodeName()
-                    + " XML node to CoverageIterator node");
-        }
-
-        Node it = x.getFirstChild();
-        while (it != null) {
-            if (it.getNodeName().equals("#text")) {
-                it = it.getNextSibling();
-                continue;
-            }
-
-            if (it.getNodeName().equals("iteratorVar")) {
-                iteratorName = it.getFirstChild().getNodeValue();
-                System.err.println("*** Iterator variable : " + iteratorName);
-            } else if (it.getNodeName().equals("coverageName")) {
-                String cn = it.getFirstChild().getNodeValue();
-                System.err.println("*** Coverage reference : " + cn);
-                try {
-                    if (!source.coverages().contains(cn)) {
-                        throw new WCPSException("Unknown coverage " + cn);
-                    }
-                } catch (ResourceException e) {
-                    throw new WCPSException(
-                            "Cannot load coverage information!", e);
-                }
-
-                coverageNames.add(cn);
-            }
-
-            it = it.getNextSibling();
-        }
-    }
-
-    public CoverageIterator(String iterator, String coverage) throws WCPSException {
-        coverageNames = new ArrayList<String>();
-        iteratorName = iterator;
-        coverageNames.add(coverage);
-        this.dynamic = true;
-    }
-
-    public Iterator<String> getCoverages() {
-        return coverageNames.iterator();
-    }
-
-    public String getIteratorName() {
-        return iteratorName;
-    }
-
-    public String toRasQL() {
-        // TODO(andreia) : How to translate multiple coverages?
-        return coverageNames.get(0) + " AS " + iteratorName;
-    }
-}
+package petascope.wcps.server.core;
+
+import petascope.core.IDynamicMetadataSource;
+import petascope.exceptions.PetascopeException;
+import petascope.exceptions.WCPSException;
+import org.w3c.dom.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class CoverageIterator implements IRasNode {
+
+    private List<String> coverageNames;
+    private String iteratorName;
+    private boolean dynamic = false;    // created from a Construct Coverage expr?
+
+    public CoverageIterator(Node x, XmlQuery xq) throws WCPSException, PetascopeException {
+        IDynamicMetadataSource source = xq.getMetadataSource();
+        coverageNames = new ArrayList<String>();
+        if (!x.getNodeName().equals("coverageIterator")) {
+            throw new WCPSException("Invalid cast from " + x.getNodeName()
+                    + " XML node to CoverageIterator node");
+        }
+
+        Node it = x.getFirstChild();
+        while (it != null) {
+            if (it.getNodeName().equals("#text")) {
+                it = it.getNextSibling();
+                continue;
+            }
+
+            if (it.getNodeName().equals("iteratorVar")) {
+                iteratorName = it.getFirstChild().getNodeValue();
+                System.err.println("*** Iterator variable : " + iteratorName);
+            } else if (it.getNodeName().equals("coverageName")) {
+                String cn = it.getFirstChild().getNodeValue();
+                System.err.println("*** Coverage reference : " + cn);
+                if (!source.coverages().contains(cn)) {
+                    throw new WCPSException("Unknown coverage " + cn);
+                }
+
+                coverageNames.add(cn);
+            }
+
+            it = it.getNextSibling();
+        }
+    }
+
+    public CoverageIterator(String iterator, String coverage) throws WCPSException {
+        coverageNames = new ArrayList<String>();
+        iteratorName = iterator;
+        coverageNames.add(coverage);
+        this.dynamic = true;
+    }
+
+    public Iterator<String> getCoverages() {
+        return coverageNames.iterator();
+    }
+
+    public String getIteratorName() {
+        return iteratorName;
+    }
+
+    public String toRasQL() {
+        // TODO(andreia) : How to translate multiple coverages?
+        return coverageNames.get(0) + " AS " + iteratorName;
+    }
+}