Changeset 1435 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Timestamp:

06/24/11 21:42:19 (13 years ago)

Author:

gaba

Message:

publishing bookmarksets
corrections of workspacehandling

Location:

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

Files:

• VirtualCollectionProxyAction.java (modified) (1 diff)
• WorkspaceAction.java (modified) (6 diffs)

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

@@ -108 +108 @@
                 //"http://clarin.ids-mannheim.de/vcr/service/virtualcollection";
                 String urlstring = Admin.getConfig().getProperty("virtualcollection.uri");
-                String vcrstr = (String)getQueryVcrid();
+                String vcrstr = (String)getVcrid();//getQueryVcrid();
                 if (!vcrstr.equals("0")){
                         urlstring = urlstring + "/" + vcrstr;

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

@@ -459 +459 @@
             nodelist.item(0).setTextContent(to_id);
         }
-        public String createNewId(String name){
+        public String createNewId(){//String name){
+                String name = "maxid";
                 String id = workspace_doc.getElementsByTagName(name).item(0).getTextContent();
                 Integer i = Integer.parseInt(id) + 1;
@@ -545 +546 @@
                         Node node = new_doc.getFirstChild();
                         if (this.qid.equals("0")){
-                                newid = createNewId("maxqid");   
+                                newid = createNewId();//"maxqid");       
                                 new_doc.getElementsByTagName("id").item(0).setTextContent(newid);
                         Element root = workspace_doc.getDocumentElement();
@@ -582 +583 @@
                                                 Node node = new_doc.getFirstChild();
                                                 if (this.qid.equals("0")){
-                                                        newid = createNewId("maxbid");   
+                                                        newid = createNewId();//"maxbid");       
                                                         new_doc.getElementsByTagName("id").item(0).setTextContent(newid);
                                                 Element root = workspace_doc.getDocumentElement();
@@ -620 +621 @@
                                                 Node node = new_doc.getFirstChild();
                                                 if (this.qsid.equals("0")){
-                                                        newid = createNewId("maxqsid");  
+                                                        newid = createNewId();//"maxqsid");      
                                                         new_doc.getElementsByTagName("id").item(0).setTextContent(newid);
                                                 Element root = workspace_doc.getDocumentElement();
@@ -659 +660 @@
                                                 Node node = new_doc.getFirstChild();
                                                 if (this.qsid.equals("0")){
-                                                        newid = createNewId("maxbsid");  
+                                                        newid = createNewId();//"maxbsid");      
                                                         new_doc.getElementsByTagName("id").item(0).setTextContent(newid);
                                                 Element root = workspace_doc.getDocumentElement();
@@ -935 +936 @@
                 }
 
+     return result;
+}
+
+public Object getVcrid() throws XPathExpressionException{
+        
+        XPathFactory factory = XPathFactory.newInstance(); 
+    XPath xpath = factory.newXPath(); 
+    XPathExpression expr1, expr2;
+                //expr = xpath.compile("item[id='" + this.qid + "']/vcrid");
+                expr1 = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item/Queries/item[id='" + this.qid + "']/vcrid");
+                expr2 = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Bookmarksets/item[id='" + this.qid + "']/vcrid");
+            
+                //expression is evaluated with respect to a certain context node which is doc.
+                Object result = null;
+                try{
+                result = expr1.evaluate(workspace_doc, XPathConstants.STRING);
+                } catch(Exception e){
+                        
+                }
+                if (result.equals("")){
+                        try{
+                        result = expr2.evaluate(workspace_doc, XPathConstants.STRING);
+                        } catch(Exception e){
+                                
+                        }
+                }
      return result;
 }