Changeset 706
- Timestamp:
- 09/20/10 09:15:44 (14 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r704 r706 942 942 943 943 //$.post("/MDService2/workspaceprofilesave/1/" + JSONText, ""); 944 //var JSONText1 = "{WorkspaceProfile:{Querysets:{[{Query:}]}}}"; 944 945 $.post("/MDService2/workspaceprofilesave/1/", JSONText); 945 946 } -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r704 r706 12 12 this.maximumRecords = 50; 13 13 //TODO load 14 15 //16 this.is_resubmit = 0;17 14 }; 18 15 … … 44 41 45 42 Query.prototype.query_uri = function () { 46 return "?q=" + escape(this.query) + "&collection=" + this.collection + "&columns=" + this.columns + "&startRecord=" + this.startRecord + "& iend=" + this.maximumRecords;43 return "?q=" + escape(this.query) + "&collection=" + this.collection + "&columns=" + this.columns + "&startRecord=" + this.startRecord + "&maximumRecords=" + this.maximumRecords; 47 44 //return $.param(this.query); 48 45 }; … … 111 108 }; 112 109 113 Query.prototype.submit = function () { 110 Query.prototype.submit = function () { 111 112 var uri = link('recordset','htmltable', this.query_uri()); 113 114 notifyUser("submitting query:" + uri); 115 this.container.find('.result').load( uri, function() { 116 notifyUser("result-loaded",'debug'); 117 118 var get = $(this).parent().find('.cmd_get'); 119 120 get.removeClass('cmd_get'); 121 get.addClass('cmd_up'); 122 // get.show(); 123 124 var result_header = $(this).children('.result_header'); 125 126 var q_header; 127 q_header = $(this).parent().find('.query_header'); 128 q_header.append(result_header); 129 q_header.find('.reload').click(function() { 130 var qid = $(this).closest('.query_wrapper').attr("id"); 131 queryset.resubmit(qid); 132 }); 133 }); 134 135 }; 136 137 Query.prototype.resubmit = function () { 114 138 115 139 var uri = link('recordset','htmltable', this.query_uri()); 116 var re = ""; 117 118 var l_resubmit = this.is_resubmit; 119 if (l_resubmit == 1) { 120 this.is_resubmit = 0; 121 re = "re" 122 } 123 124 notifyUser(re + "submitting query:" + uri); 125 this.container.find('.result').load( uri, function() { 126 notifyUser("result-loaded",'debug'); 140 var qid = this.listid; 141 142 notifyUser("resubmitting query:" + uri); 143 144 $('#' + qid ).children('.result').children().remove(); 145 $('#' + qid ).children('.result').load( uri, function() { 146 notifyUser("result-loaded ID:" + qid,'debug'); 127 147 128 148 var get = $(this).parent().find('.cmd_get'); 129 130 149 get.removeClass('cmd_get'); 131 150 get.addClass('cmd_up'); 132 // get.show(); 133 134 var result_header = $(this).children('.result_header'); 135 136 var q_header; 137 q_header = $(this).parent().find('.query_header'); 138 if (l_resubmit == 1) { 139 result_header.remove(); 140 } else { 141 q_header.append(result_header); 142 } 143 144 q_header.find('.reload').click(function() { 145 146 var qid = $(this).closest('.query_wrapper').attr("id"); 147 queryset.resubmit(qid); 148 /* 149 var startRecord = $(this).parent().find('.start_record').val(); 150 var maximumRecords = $(this).parent().find('.maximum_records').val(); 151 var id = $(this).closest('.query_wrapper').attr("id"); 152 153 queryset_container.container = $('#' + id ); 154 var q = queryset.queries[id.substring(1)-1]; 155 156 q.startRecord = startRecord; 157 q.maximumRecords = maximumRecords; 158 q.is_resubmit = 1; 159 q.submit(); 160 queryset_container.container = $('#q' + queryset.queries.length ); 161 //$('#' + id ). 162 */ 163 }); 164 }); 151 // get.show(); 152 $(this).children('.result_header').remove(); 153 154 }); 165 155 166 156 }; … … 279 269 resubmit: function(qid){ 280 270 var query = queryset.queries[qid.substring(1)-1]; 281 queryset_container.container = $('#' + qid ); 282 query.is_resubmit = 1; 271 283 272 query.startRecord = $('#' + qid ).find('.start_record').val(); 284 273 query.maximumRecords = $('#' + qid ).find('.maximum_records').val(); 285 query.submit(); 286 queryset_container.container = $('#q' + queryset.queries.length ); 287 288 } 289 290 291 }; 274 query.resubmit(); 275 276 } 277 278 279 }; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/CompRegistryProxyAction.java
r704 r706 92 92 Admin.notifyUser("CCCRPA." + getFullFormat()); 93 93 MDTransformer.getMDTransformer().setSrcFile(getTargetRequest()); 94 _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream, getFullFormat(),null );94 _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream, getFullFormat(),null,null,null); 95 95 Admin.notifyUser("CRPA.- elements"); 96 96 setActionkey("elements"); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java
r704 r706 30 30 private String actionkey; 31 31 private String q; 32 private String cache = Cache. USE;32 private String cache = Cache.SKIP; 33 33 private String collection; 34 34 private String columns; 35 private String startRecord; 36 private String maximumRecords; 35 37 private int maxdepth; 36 38 private String format; … … 100 102 actionkey = actionKey; 101 103 } 102 104 105 public String getStartRecord() { 106 return startRecord; 107 } 108 109 public void setStartRecord(String startRecord) { 110 this.startRecord = startRecord; 111 } 112 113 public String getMaximumRecords() { 114 return maximumRecords; 115 } 116 117 public void setMaximumRecords(String maximumRecords) { 118 this.maximumRecords = maximumRecords; 119 } 120 103 121 public String getFullFormat() { 104 122 return actionkey + "2" + format; … … 227 245 MDTransformer.getMDTransformer().setSrcFile(getTargetRequest()); 228 246 // getColumns 229 resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns() );247 resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords()); 230 248 } 231 249 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDRepoProxyAction.java
r690 r706 66 66 query.setCollection(getCollection()); 67 67 query.setColumns(getColumns()); 68 query.setMaximumRecords(getMaximumRecords()); 69 query.setStartRecord(getStartRecord()); 70 //Admin.notifyUser("MDRPA.records:" + query.getStartRecord()); 71 //Admin.notifyUser("MDRPA.records:" + query.getMaximumRecords()); 68 72 URL targetURL = null; 69 73 -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/MDTransformer.java
r699 r706 164 164 * @throws IOException 165 165 */ 166 public void transformXML (InputStream in, String transkey, String cols, OutputStream out ) throws TransformerException, IOException {166 public void transformXML (InputStream in, String transkey, String cols, String startRecord, String maximumRecords, OutputStream out ) throws TransformerException, IOException { 167 167 168 168 // Create a transform factory instance. … … 178 178 transformer.setParameter("format", transkey); 179 179 transformer.setParameter("cols", cols); 180 /* transformer.setParameter("cols", "<col label='id'>Id</col>" + 180 if ((startRecord != null) && (maximumRecords != null)) { 181 182 transformer.setParameter("startRecord", startRecord); 183 transformer.setParameter("maximumRecords", maximumRecords); 184 } 185 /* transformer.setParameter("cols", "<col label='id'>Id</col>" + 181 186 "<col label='id'>idno</col>" + 182 187 "<col label='name'>Name</col>" + … … 220 225 * @throws TransformerException 221 226 */ 222 public InputStream transformXML ( InputStream xmlStream, String transkey, String cols ) throws IOException, InterruptedException, TransformerException {227 public InputStream transformXML ( InputStream xmlStream, String transkey, String cols, String startRecord, String maximumRecords) throws IOException, InterruptedException, TransformerException { 223 228 224 229 ByteArrayOutputStream out = new ByteArrayOutputStream(); 225 transformXML(xmlStream, transkey, cols, out);230 transformXML(xmlStream, transkey, cols, startRecord, maximumRecords, out); 226 231 InputStream transformedStream = new ByteArrayInputStream(out.toByteArray()); 227 232 //Admin.notifyUser("transformedStream:" + transformedStream.toString()); … … 241 246 242 247 ByteArrayOutputStream out = new ByteArrayOutputStream(); 243 transformXML(xmlStream, transkey, "", out);248 transformXML(xmlStream, transkey, "", "", "", out); 244 249 InputStream transformedStream = new ByteArrayInputStream(out.toByteArray()); 245 250 //Admin.notifyUser("transformedStream:" + transformedStream.toString()); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java
r692 r706 221 221 serializer.setRootName("WorkspaceProfile"); 222 222 serializer.setTypeHintsEnabled(false); 223 223 224 String xml = serializer.write( json ); 224 225 Admin.notifyUser("XML:" + xml); -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java
r704 r706 29 29 public static String COLLECTIONS = "collections"; 30 30 public static String COLUMNS = "columns"; 31 public static String startRecord = null; 32 public static String maximumRecords = null; 31 33 public static String MODEL = "model"; 32 34 public static String RECORDSET = "recordset"; … … 161 163 } 162 164 165 public String getStartRecord() { 166 return startRecord; 167 } 168 169 public void setStartRecord(String startRecord) { 170 if (startRecord!=null) { 171 this.startRecord = startRecord; 172 } 173 } 174 175 public String getMaximumRecords() { 176 return maximumRecords; 177 } 178 179 public void setMaximumRecords(String maximumRecords) { 180 if (maximumRecords!=null) { 181 this.maximumRecords = maximumRecords; 182 } 183 } 163 184 public void setMaxdepth(int maxdepth) { 164 185 if (maxdepth > 0) { … … 249 270 } else { 250 271 targetRequest = toXPath() + "&collection=" + getCollection(); 272 if ((startRecord != null) && (maximumRecords != null)) { 273 targetRequest = targetRequest + "&startRecord=" + getStartRecord() + "&iend=" + getMaximumRecords(); 274 } 251 275 } 252 276 -
MDService2/trunk/MDService2/src/struts.xml
r690 r706 199 199 <param name="format">{2}</param> 200 200 <param name="q">{3}</param> 201 <param name="cols">Id</param>202 201 <result type="stream"> 203 202 <param name="contentType">text/html</param>
Note: See TracChangeset
for help on using the changeset viewer.