Changeset 1435
- Timestamp:
- 06/24/11 21:42:19 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r1429 r1435 159 159 <span id="bts_add" class="cmd cmd_add" ></span> 160 160 <span id="bts_delete" class="cmd cmd_del" ></span> 161 <span id="bts_publish" class="cmd cmd_publish" ></span> 161 162 </div> 162 163 -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r1429 r1435 95 95 if (type == "bookmarkset"){ 96 96 name = "new_bookmarkset"; 97 json = {"name":name, "id":0, " created":str_time , "Bookmarks" : "null"};97 json = {"name":name, "id":0, "vcrid":0, "created":str_time , "Bookmarks" : "null"}; 98 98 } 99 99 if (type == "queryset"){ 100 100 name = "new_queryset"; 101 json = {"name":name, "id":0, " created":str_time , "Queries" : "null"};101 json = {"name":name, "id":0, "vcrid":0, "created":str_time , "Queries" : "null"}; 102 102 } 103 103 } … … 235 235 query.id = $(data).text(); 236 236 if (query.bookmark == 0){ 237 this.addelement("query", json, query);237 workspace.addelement("query", json, qsid); 238 238 appendQueryUI(json,qsid, $('#userqueries')); 239 239 } else { 240 this.addelement("bookmark", json, query);240 workspace.addelement("bookmark", json, qsid); 241 241 appendBookmarkUI(json,qsid, $('#bookmarks')); 242 242 } -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js
r1429 r1435 231 231 $('.cmd_publish').live('click', function(event){ 232 232 var query = $(this).parent().data('query'); 233 query.publish(); 233 if (query != undefined){ // query 234 query.publish(); 235 } else { // bookmarksets 236 var json = workspace.getTypedElement('user','bookmarkset'); 237 var id = parseInt($('#bts_select').find("option:selected").val()); 238 var bsjson = json[id]; 239 $.get("/MDService2/virtualcollection/USER/" + bsjson.id,"", function(data){ 240 if (bsjson.vcrid == 0){ 241 var id = parseInt($(data).children().children('virtualcollectionid').text()); 242 bsjson.vcrid = id; 243 workspace.savequeryset(bsjson, 1); 244 } 245 }); 246 } 247 234 248 }); 235 249 -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js
r1429 r1435 405 405 var del = ''; 406 406 var name = ''; 407 var id = $( qs).parent().attr('id');407 var id = $(bs).parent().attr('id'); 408 408 409 409 del = '<span class="cmd cmd_del" ><xsl:text> </xsl:text></span>'; … … 422 422 qq = ""; 423 423 } 424 var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller-inline" ><a href="'+ id + '_'+ i+'" >' +424 var x = '<div class="cmds-elem-plus" ><span class="cmd cmd_load"></span><span class="detail-caller-inline" ><a href="'+ id + '_'+ i+'" >' + 425 425 json.name + '</a></span>' + 426 426 del + 427 '< span class="cmd cmd_publish"></span><div class="detail" >' +427 '<div class="detail" >' + 428 428 name + 429 429 '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + squery + '</span></div>' + … … 454 454 $(this).data("query").name = $(this).val(); 455 455 workspace.save("user"); 456 //var query = new Query(); 457 //query.load($(this).data("queryjson")); 458 //query.save(); 459 /* 460 var id = parseInt( $("#qts_select option:selected").val()); 461 $(this).parent().parent().parent().find('a').text($(this).val()); 462 var str = $(this).parent().parent().parent().find('a').attr("href"); 463 var iq = parseInt(str.substring(7)); 464 465 jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq].name = $(this).val(); 466 //saveWorkspace("USER"); 467 Workspace.save("USER"); 468 */ 456 469 457 evStop(); 470 458 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/VirtualCollectionProxyAction.java
r1389 r1435 108 108 //"http://clarin.ids-mannheim.de/vcr/service/virtualcollection"; 109 109 String urlstring = Admin.getConfig().getProperty("virtualcollection.uri"); 110 String vcrstr = (String)get QueryVcrid();110 String vcrstr = (String)getVcrid();//getQueryVcrid(); 111 111 if (!vcrstr.equals("0")){ 112 112 urlstring = urlstring + "/" + vcrstr; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r1417 r1435 459 459 nodelist.item(0).setTextContent(to_id); 460 460 } 461 public String createNewId(String name){ 461 public String createNewId(){//String name){ 462 String name = "maxid"; 462 463 String id = workspace_doc.getElementsByTagName(name).item(0).getTextContent(); 463 464 Integer i = Integer.parseInt(id) + 1; … … 545 546 Node node = new_doc.getFirstChild(); 546 547 if (this.qid.equals("0")){ 547 newid = createNewId( "maxqid");548 newid = createNewId();//"maxqid"); 548 549 new_doc.getElementsByTagName("id").item(0).setTextContent(newid); 549 550 Element root = workspace_doc.getDocumentElement(); … … 582 583 Node node = new_doc.getFirstChild(); 583 584 if (this.qid.equals("0")){ 584 newid = createNewId( "maxbid");585 newid = createNewId();//"maxbid"); 585 586 new_doc.getElementsByTagName("id").item(0).setTextContent(newid); 586 587 Element root = workspace_doc.getDocumentElement(); … … 620 621 Node node = new_doc.getFirstChild(); 621 622 if (this.qsid.equals("0")){ 622 newid = createNewId( "maxqsid");623 newid = createNewId();//"maxqsid"); 623 624 new_doc.getElementsByTagName("id").item(0).setTextContent(newid); 624 625 Element root = workspace_doc.getDocumentElement(); … … 659 660 Node node = new_doc.getFirstChild(); 660 661 if (this.qsid.equals("0")){ 661 newid = createNewId( "maxbsid");662 newid = createNewId();//"maxbsid"); 662 663 new_doc.getElementsByTagName("id").item(0).setTextContent(newid); 663 664 Element root = workspace_doc.getDocumentElement(); … … 935 936 } 936 937 938 return result; 939 } 940 941 public Object getVcrid() throws XPathExpressionException{ 942 943 XPathFactory factory = XPathFactory.newInstance(); 944 XPath xpath = factory.newXPath(); 945 XPathExpression expr1, expr2; 946 //expr = xpath.compile("item[id='" + this.qid + "']/vcrid"); 947 expr1 = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Querysets/item/Queries/item[id='" + this.qid + "']/vcrid"); 948 expr2 = xpath.compile("//Profiles/WorkspaceProfiles/WorkspaceProfile/Bookmarksets/item[id='" + this.qid + "']/vcrid"); 949 950 //expression is evaluated with respect to a certain context node which is doc. 951 Object result = null; 952 try{ 953 result = expr1.evaluate(workspace_doc, XPathConstants.STRING); 954 } catch(Exception e){ 955 956 } 957 if (result.equals("")){ 958 try{ 959 result = expr2.evaluate(workspace_doc, XPathConstants.STRING); 960 } catch(Exception e){ 961 962 } 963 } 937 964 return result; 938 965 }
Note: See TracChangeset
for help on using the changeset viewer.