Changeset 1429
- Timestamp:
- 06/21/11 19:30:01 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/index.jsp
r1384 r1429 87 87 <label>Complex query</label><span name='detail_index' class='cmd cmd_detail'></span><br/> 88 88 <div id="searchclauselist"></div> 89 <input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label> 89 <!--<input type="checkbox" checked="false" id="input-withsummary" name="WS"/><label>with Summary</label> 90 --> 90 91 </td> 91 92 </tr> -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r1417 r1429 33 33 case 'bookmark': 34 34 return json["WorkspaceProfile"]["Bookmarksets"][id]["Bookmarks"]; 35 case 'customtermset': 36 return json["WorkspaceProfile"].CustomTermsets; 35 37 } 36 38 … … 65 67 } else { 66 68 workspace.user_json["WorkspaceProfile"]["Bookmarksets"][id]["Bookmarks"] = data; 69 } 70 break; 71 case 'customtermset': 72 if (data == "[{}]"){ 73 this.user_json["WorkspaceProfile"].CustomTermsets = [{}]; 74 } else { 75 this.user_json["WorkspaceProfile"].CustomTermsets = data; 67 76 } 68 77 break; … … 803 812 804 813 this.container = $('#' + this.listid ); 805 814 $(this.container).data('query',this); 815 806 816 notifyUser("DEBUG: setting up removing query:" + $(this).closest('.query_wrapper').attr('id')); 807 817 $(this.container).children('.query_header').find('.cmd_del').click(function(event) { … … 922 932 addDetailFunctionality(q_header, query); 923 933 }); 934 935 }; 936 937 Query.prototype.summaryinfo = function () { 938 939 var uri = link('recordset',this.format, this.query_uri()); 940 //columns-wrapper 941 var temp = $('<div />'); 942 $(temp).data('qcontainer',$(this.container)); 943 $(temp).load(uri, function(response, status, xhr) { 944 //detailcaller.getdetail("detail_query").close(); 945 /* 946 var profiles = $(this).find('.used-profiles'); 947 var parent = $(this).data('qcontainer').find('.used-profiles').parent(); 948 $(parent).remove('.used-profiles').append(profiles); 949 950 var summary = $(this).find('.result-summary'); 951 parent = $(this).data('qcontainer').find('.result-summary').parent(); 952 $(parent).remove('.result-summary').append(summary); 953 */ 954 //detailcaller.calldetail($(this).data('qcontainer').find('.result-header').find('.cmd_detail')); 955 956 // direct replace detail data 957 var detailcontent = detailcaller.getdetail("detail_query").content; 958 959 var profiles = $(this).find('.used-profiles'); 960 var parent = detailcontent.find('.used-profiles').parent(); 961 $(parent).find('.used-profiles').remove(); 962 $(parent).append(profiles); 963 964 var summary = $(this).find('.result-summary'); 965 $(summary).find('.terms-tree').treeTable({initialState:"collapsed"}); 966 var parent = detailcontent.find('.result-summary').parent(); 967 $(parent).find('.result-summary').remove(); 968 $(parent).append(summary); 969 $(parent).find('.cmd_columns').click(function(){ 970 query_wrapper_add_column($(this)); 971 }); 972 }); 973 924 974 925 975 }; … … 1238 1288 //q_header.find('.cmd_add').click(function(){ 1239 1289 //q_header.find('.cmd_columns').data('query', query); 1240 q_header.find('.cmd_columns').click( function(){1290 q_header.find('.cmd_columns').click( function(){ 1241 1291 query_wrapper_add_column($(this)); 1242 1292 //$(this).data('query').resubmit(); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui.js
r1388 r1429 248 248 var columns = "";//columns_widget.getColumnsListText(); 249 249 var collections = collections_widget.widgets; //searchclauseset.sctext; 250 var ws = $('#input-withsummary').attr("checked");250 //var ws = $('#input-withsummary').attr("checked"); 251 251 252 252 notifyUser("processing query"); … … 261 261 var q = new Query(collections, columns, query, squery); //actions.collections.current, query ); 262 262 q.repository = getSelectedRepository(); 263 if (ws) {264 q.options = "withSummary";265 }263 //if (ws) { 264 // q.options = "withSummary"; 265 //} 266 266 notifyUser("submit_query:" + q.query_uri(),'debug'); 267 267 queryset.addquery(q); … … 738 738 }); 739 739 740 $('.detail-wrapper .cmd_withsummary').live('click',function(event){ 741 var detail = $(this).closest('.detail-wrapper').data('detail'); 742 var query = detail.query; 743 // aaaload new query 744 query.summaryinfo(); 745 // copy summary data 746 //detailcaller.calldetail($(query.container).find('.result-header').find('.cmd_detail')); 747 }); 748 740 749 $('#bookmarks .cmd_load').live('click',function(event){ 741 750 var q = $(this).closest('.cmds-elem-plus').data("query");//json"); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_detail.js
r1350 r1429 24 24 this.content = undefined; 25 25 this.temp_id = ""; 26 this.query = undefined; 26 27 27 28 this.setData(); … … 31 32 this.detailwidget = detailwidget; 32 33 this.temp_id = ""; 34 this.query = undefined; 33 35 this.url = url; 34 36 this.setData(); … … 46 48 this.url = undefined; 47 49 this.temp_id = $(widget).closest('.query_wrapper').attr('id'); 50 this.query = $(widget).closest('.query_wrapper').data('query'); 48 51 break; 49 52 case 'collections': … … 100 103 "</div>"; 101 104 this.content_wrapper = $(cw); 105 $(this.content_wrapper).data('detail', this); 102 106 103 107 }; … … 105 109 if (this.name == 'query'){ 106 110 if ($(this.content).find('.columns-selected').children('.widget-wrapper').length == 0){ 107 var query = queryset.getQuery(this.temp_id);111 var query = this.query;//queryset.getQuery(this.temp_id); 108 112 //enrich link,xml 113 //options withSummary 114 //var options = "<input type='checkbox' checked='false' id='input-withsummary' name='WS'/><label>with Summary</label>"; 115 109 116 var links = "<a class='cmd cmd_xml' target='_blank' href='" + query.link("xml") + "'>sru</a> " + 110 "<a class='cmd cmd_link' target='_blank' href='" + query.link("fullpage") + "' >link</a>"; 117 "<a class='cmd cmd_link' target='_blank' href='" + query.link("fullpage") + "' >link</a> " + 118 "<span class='cmd cmd_withsummary'></span>"; 111 119 $(this.content).find('.cmds').append($(links)); 120 121 112 122 //enrich with selectionlist 113 123 var selectionlist = new SelectionList($(this.content).find('.columns-selected')); -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_ui_load.js
r1389 r1429 655 655 656 656 function saveTermset(id, name, listwidget) { 657 658 657 659 var terms = [{}]; 658 660 … … 664 666 var str_time = dateFormat(dt);//dt.toString("dd/mm/yyyy HH:mm:ss"); 665 667 var jsont = {"name":name, "time" : str_time, "Terms" :terms}; 668 669 workspace.addelement("customtermset",jsont); 670 workspace.save("user"); 671 /* 666 672 if (jsonw["WorkspaceProfile"]["CustomTermsets"] == "null") { 667 673 jsonw["WorkspaceProfile"]["CustomTermsets"] = [{}]; … … 673 679 //saveWorkspace("USER"); 674 680 Workspace.save("USER"); 675 681 */ 676 682 }; 677 683 function removeTermset(id){ 684 workspace.removeelement("customtermset",id); 685 workspace.save("user"); 686 /* 678 687 var size = jsonw["WorkspaceProfile"]["CustomTermsets"].length; 679 688 … … 690 699 //saveWorkspace("USER"); 691 700 Workspace.save("USER"); 701 */ 692 702 } 693 703 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Admin.java
r1008 r1429 45 45 public static String DEBUG = "debug"; 46 46 public static String TRACE = "trace"; 47 47 48 48 49 public static void main(String[] args) { … … 234 235 public static void notifyUser(String msg, String type ) { 235 236 //Logger log = Logger.getLogger("Admin.class"); 237 if (msg.length() == 0){ 238 return; 239 } 236 240 if (type.equals(Admin.FATAL)) { 237 241 log.fatal(msg); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r1417 r1429 21 21 import net.sf.json.JSONObject; 22 22 import net.sf.json.JSONSerializer; 23 //import net.sf.saxon.Controller; 24 //import net.sf.saxon.event.MessageEmitter; 23 25 24 26 … … 608 610 // Admin.notifyUser("GPA.getRepository, before xsl:" + getRepository()); 609 611 transformer.setParams(createTransformerParams()); 612 610 613 resultStream = transformer.transformXML(sourceStream);//, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository())); 611 614 } -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java
r911 r1429 2 2 3 3 import java.io.BufferedInputStream; 4 import java.io.BufferedReader; 4 5 import java.io.ByteArrayInputStream; 5 6 import java.io.ByteArrayOutputStream; … … 8 9 import java.io.IOException; 9 10 import java.io.InputStream; 11 import java.io.InputStreamReader; 10 12 import java.io.OutputStream; 11 13 import java.io.Reader; 12 14 import java.io.StringReader; 13 15 import java.io.StringWriter; 16 import java.io.Writer; 14 17 import java.net.URL; 15 18 import java.util.HashMap; … … 21 24 import javax.xml.parsers.DocumentBuilderFactory; 22 25 import javax.xml.parsers.ParserConfigurationException; 26 //import javax.xml.transform.ErrorListener; 23 27 import javax.xml.transform.OutputKeys; 24 28 import javax.xml.transform.Transformer; … … 31 35 import javax.xml.transform.stream.StreamSource; 32 36 33 import ognl.IntHashMap.Entry; 37 //import ognl.IntHashMap.Entry; 38 39 import net.sf.saxon.event.MessageEmitter; 40 import net.sf.saxon.event.MessageWarner; 34 41 35 42 import org.w3c.dom.Document; … … 37 44 import org.w3c.dom.Node; 38 45 import org.w3c.dom.NodeList; 46 47 //import com.icl.saxon.*; 48 //import com.icl.saxon.FeatureKeys; 49 //import com.icl.saxon.Loader; 50 //import com.icl.saxon.output.Emitter; 51 39 52 40 53 /** … … 197 210 //public void transformXML (InputStream in, String transkey, String cols, String startRecord, String maximumRecords, String lang, String q, String repositoryURI, OutputStream out ) throws TransformerException, IOException { 198 211 212 System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl"); 199 213 // Create a transform factory instance. 200 214 TransformerFactory tfactory = TransformerFactory.newInstance(); … … 207 221 getXSLStreamSource(getTranskey())); 208 222 SetTransformerParameters(transformer); 223 224 //MessageWarner gg = new net.sf.saxon.event.MessageWarner(); 225 MessageEmitter me = new net.sf.saxon.event.MessageEmitter(); 226 StringWriter w = new StringWriter(); 227 me.setWriter(w); 228 ((net.sf.saxon.Controller)transformer).setMessageEmitter(me);//new net.sf.saxon.event.MessageWarner()); 229 209 230 /* transformer.setParameter("q", q); 210 231 transformer.setParameter("lang", lang); … … 258 279 // Transform the source XML to out-stream 259 280 transformer.transform(src, stream ); 281 282 // Write <xsl:message> 283 writeXslMessages(w); 284 ///Admin.notifyUser(w.getBuffer().toString()); 260 285 } 261 286 287 private void writeXslMessages(StringWriter w){ 288 289 byte[] bytes = w.getBuffer().toString().getBytes(); 290 InputStream is = new ByteArrayInputStream(bytes); 291 BufferedReader br = new BufferedReader(new InputStreamReader(is)); 292 String s; 293 try { 294 while ((s = br.readLine()) != null){ 295 Admin.notifyUser(s); 296 } 297 } catch (IOException e) { 298 // TODO Auto-generated catch block 299 e.printStackTrace(); 300 } 301 302 } 262 303 /** 263 304 * just a wrapper for the main method translating the output-stream into a input-stream (expected by the Controller-Actions to return as response) … … 323 364 * @param transkey 324 365 * @return 366 * @throws IOException 325 367 */ 326 368 public String transformXML (String xml) { … … 330 372 // Create a transform factory instance. 331 373 System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl"); 374 //System.setProperty("javax.xml.transform.TransformerFactory", "com.icl.saxon.TransformerFactoryImpl"); 332 375 TransformerFactory tfactory = TransformerFactory.newInstance(); 333 376 OutputStream os = new ByteArrayOutputStream(); … … 343 386 tfactory.newTransformer(new StreamSource(xslIS)); 344 387 */ 345 this.SetTransformerParameters(transformer); 346 //transformer.setParameter("format", transkey); 347 348 //Admin.notifyUser("transformer.parmformat" + transformer.getParameter("format")); 388 //////////////////// 389 MessageEmitter me = new net.sf.saxon.event.MessageEmitter(); 390 StringWriter w = new StringWriter(); 391 me.setWriter(w); 392 ((net.sf.saxon.Controller)transformer).setMessageEmitter(me);//new net.sf.saxon.event.MessageWarner()); 349 393 350 394 // Transform the source XML to System.out. … … 355 399 transformer.transform(src, stream ); 356 400 // new StreamResult(new File("Simple2.out"))); 357 401 // Write <xsl:message> 402 writeXslMessages(w); 403 358 404 result = os.toString(); 359 405 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java
r1085 r1429 83 83 public Query(String squeryString,String queryString, String type, String collection, String columns) { 84 84 this.type =type; 85 if (squeryString == null)squeryString =""; 86 if (queryString == null)queryString =""; 85 87 setFullQueryString(squeryString, queryString); 86 88 setCollection(collection); … … 96 98 97 99 public Query(String squeryString, String queryString, String type, String collection) { 98 this.type =type; 99 setFullQueryString(squeryString, queryString); 100 setCollection(collection); 100 //this.type =type; 101 //setFullQueryString(squeryString, queryString); 102 //setCollection(collection); 103 this(squeryString, queryString, type, collection, "Id,name"); 101 104 } 102 105 … … 109 112 110 113 public Query(String squeryString, String queryString, String type) { 111 this.type =type; 112 if (squeryString == null)squeryString =""; 113 setFullQueryString(squeryString, queryString); 114 //this.type =type; 115 //if (squeryString == null)squeryString =""; 116 //setFullQueryString(squeryString, queryString); 117 this(squeryString, queryString, type, ""); 114 118 } 115 119 … … 225 229 public void setStartItem(String startItem) { 226 230 if (startItem!=null) { 227 this.startItem = startItem; 231 if (startItem.equals("")){ 232 // sets default startItem 233 this.startItem = "1"; 234 }else { 235 this.startItem = startItem; 236 } 228 237 } 229 238 } … … 235 244 public void setMaximumItems(String maximumItems) { 236 245 if (maximumItems!=null) { 237 this.maximumItems = maximumItems; 246 if (maximumItems.equals("")){ 247 this.maximumItems = "50"; 248 } else { 249 this.maximumItems = maximumItems; 250 } 238 251 } 239 252 } … … 433 446 * applying a stylesheet on the XCQL-version 434 447 * @return XPath-query 448 * @throws IOException 435 449 */ 436 450 public String toXPath() {
Note: See TracChangeset
for help on using the changeset viewer.