Changeset 1388 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

06/01/11 21:59:12 (13 years ago)

Author:

gaba

Message:

save, savenew
publish existing query
workspace functionality corrections

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action

Files:

• VirtualCollectionProxyAction.java (modified) (3 diffs)
• WorkspaceAction.java (modified) (6 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java

@@ -36 +36 @@
         //private String proxy_key = "virtual_collection";
         
-        private String qid;
+        //private String qid;
         //private String date;
         //private String datefrom;
         //private String dateto;
-        
+        /*
         public String getQid(){
                 return qid;
@@ -47 +47 @@
                 this.qid = qid;
         }
-        
+        */
         @Override
         protected void  initialize(){
@@ -105 +105 @@
         
                 //create connection and post request data
-                
-        URL url = new URL("http://clarin.ids-mannheim.de/vcr/service/virtualcollection");
+                // find out 
+                String urlstring = "http://clarin.ids-mannheim.de/vcr/service/virtualcollection";
+                String vcrstr = (String)getQueryVcrid();
+                if (!vcrstr.equals("0")){
+                        urlstring = urlstring + "/" + vcrstr;
+                }
+                //qlist.item(0).get
+        URL url = new URL(urlstring);
         String charset = "UTF-8"; 
         URLConnection urlconn = url.openConnection();

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java

@@ -552 +552 @@
                    // apend to specific queryset
                                 NodeList wsnodelist = (NodeList) getQueryParent();
-                        wsnodelist.item(0).appendChild(node2);
+                                Node anode = wsnodelist.item(0);
+                                if (anode.getTextContent().trim().toLowerCase().equals("null")){
+                                        anode.setTextContent("");
+                                }
+                        anode.appendChild(node2);
                         } 
                         
@@ -585 +589 @@
                                            // apend to specific bookmarkset
                                                         NodeList wsnodelist = (NodeList) getBookmarkParent();
-                                                wsnodelist.item(0).appendChild(node2);
+                                                        Node anode = wsnodelist.item(0);
+                                                        if (anode.getTextContent().trim().toLowerCase().equals("null")){
+                                                                anode.setTextContent("");
+                                                        }
+                                                anode.appendChild(node2);
                                                 } 
                                                 
@@ -620 +628 @@
                                                 NodeList wsnodelist = (NodeList) this.getWorkspace();
                                                 Element welem = (Element)wsnodelist.item(0);
-                                                        welem.getElementsByTagName("Querysets").item(0).appendChild(node2);
+                                                        Node anode = welem.getElementsByTagName("Querysets").item(0);
+                                                        if (anode.getTextContent().trim().toLowerCase().equals("null")){
+                                                                anode.setTextContent("");
+                                                        }
+                                                        anode.appendChild(node2);
                                                 } 
                                                 
@@ -655 +667 @@
                                                 NodeList wsnodelist = (NodeList) this.getWorkspace();
                                                 Element welem = (Element)wsnodelist.item(0);
-                                                        welem.getElementsByTagName("Bookmarksets").item(0).appendChild(node2);
+                                                Node anode = welem.getElementsByTagName("Bookmarksets").item(0);
+                                               if (anode.getTextContent().trim().toLowerCase().equals("null")){
+                                                                anode.setTextContent("");
+                                                        }
+                                                anode.appendChild(node2);
                                                 } 
                                                 
@@ -873 +889 @@
             XPathExpression expr;
                         expr = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item/Queries/item[id='" + this.qid + "']");
+                        //expr = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item/Queries/item[id='" +this.qid.toString()+"']");
                                 //expr = xpath.compile("//item[@id='" + this.qid + "']");
                         //expression is evaluated with respect to a certain context node which is doc.
@@ -901 +918 @@
              return result;
         }
+
+public Object getQueryVcrid() throws XPathExpressionException{
+        
+        XPathFactory factory = XPathFactory.newInstance(); 
+    XPath xpath = factory.newXPath(); 
+    XPathExpression expr;
+//              expr = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item[id='" + this.qsid + "']/vcrid");
+                expr = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item/Queries/item[id='" + this.qid + "']/vcrid");
+            
+                //expression is evaluated with respect to a certain context node which is doc.
+                Object result = null;
+                try{
+                result = expr.evaluate(workspace_doc, XPathConstants.STRING);
+                } catch(Exception e){
+                        
+                }
+
+     return result;
+}
         public Object getQueryset() throws XPathExpressionException{