Changeset 1008
- Timestamp:
- 12/22/10 13:34:18 (13 years ago)
- Location:
- MDService2/trunk/MDService2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
MDService2/trunk/MDService2/WebContent/scripts/mdservice2_ui.js
r980 r1008 699 699 /* 700 700 * deactivated -> obsolete? 701 * 701 702 $('#terms .cmd_detail').live('click', function(event) { 702 703 //showTermDetail($(this).parent().text()); … … 712 713 713 714 }); 714 */ 715 715 */ 716 716 } 717 717 function loadComponentsRegistry(){ … … 1055 1055 }); 1056 1056 1057 $('.result .cmd_detail').live('click', function(event) { 1057 $('.result .cmd_detail').live('click', function(event) { 1058 1058 1059 var uri = $(this).parent().find("a").attr('href'); // + " body"; 1059 1060 $.get(uri, showDetail,'html'); … … 1084 1085 }); 1085 1086 1087 1086 1088 $('#querylist .cmd_save').live('click', function(event) { 1087 var qid = $(this).closest('.query_wrapper').attr("id"); 1088 var qstring = queryset.getquerystring(qid); 1089 var json_coll = queryset.getcollections(qid); 1090 var json_cols = queryset.getcolumns(qid); 1091 var squery = queryset.getsquery(qid); 1089 1090 var qid = ""; 1091 var qstring = ""; 1092 var json_coll = "null"; 1093 var json_cols = "null"; 1094 var squery = ""; 1095 var bookmark = "0"; 1096 1097 if ($(this).parents('.result').length > 0){ 1098 qstring = $(this).parent().find("a").attr('href'); 1099 qstring = qstring.substring(18,qstring.length); 1100 bookmark = "1"; 1101 } else { 1102 qid = $(this).closest('.query_wrapper').attr("id"); 1103 qstring = queryset.getquerystring(qid); 1104 json_coll = queryset.getcollections(qid); 1105 json_cols = queryset.getcolumns(qid); 1106 squery = queryset.getsquery(qid); 1107 } 1108 1092 1109 // JSON conversion 1093 1110 if (qstring.length == 0){ … … 1104 1121 jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}]; 1105 1122 } 1106 var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols}; 1107 var name = Query.fullformatstring(jsonq); 1123 var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "bookmark" : bookmark}; 1124 1125 var name; 1126 if (bookmark == "1") { 1127 qstring = Url.decode(qstring); 1128 var s = qstring.split(':'); 1129 name = s[s.length - 2] + ":" + s[s.length - 1]; 1130 } else { 1131 name = Query.fullformatstring(jsonq); 1132 } 1108 1133 jsonq.name = name; 1109 1134 … … 1159 1184 1160 1185 }); 1161 1162 1186 1163 1187 1164 1188 $('.cmd_down').live('click', function(event) { … … 1266 1290 }); 1267 1291 $('#serverqueries .cmd_load').live('click',function(event){ 1268 hideWelcomeMessage();1292 1269 1293 var id = parseInt( $("#serverqts_select option:selected").val()); 1270 1294 var str = $(this).parent().find('a').attr("href"); 1271 1295 var iq = parseInt(str.substring(9)); 1272 1296 var json = jQuery.parseJSON($("#serverqs").attr("data")); 1273 var query = new Query([],"","",""); 1274 query.load(json["WorkspaceProfile"]["Querysets"][id]["Queries"][iq]); 1275 query.repository = getSelectedRepository(); 1276 queryset.addquery(query); 1277 1278 searchclauseset.sctext = query.query; 1279 notifyUser(searchclauseset.sctext,'debug'); 1280 searchclauseset.buildfromquerystring(); 1281 1282 collections = query.collection; 1283 //$('#collection_list').attr("value",query.getcollectiontext("name")); 1284 collections_widget.load(query.collection); 1285 //$('#columns_list').attr("value",query.columns); 1286 columns_widget.load(query.columns.split(',')); 1287 $('#input-simplequery').attr("value",query.squery); 1297 var q = json["WorkspaceProfile"]["Querysets"][id]["Queries"][iq]; 1298 1299 loadQuery(q); 1288 1300 }); 1289 1301 $('#userqueries .cmd_load').live('click',function(event){ 1290 hideWelcomeMessage();1302 1291 1303 var id = parseInt( $("#qts_select option:selected").val()); 1292 1304 var str = $(this).parent().find('a').attr("href"); 1293 1305 var iq = parseInt(str.substring(7)); 1294 1295 var query = new Query([],"","",""); 1296 query.load(jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq]); 1297 query.repository = getSelectedRepository(); 1298 queryset.addquery(query); 1299 1300 searchclauseset.sctext = query.query; 1301 notifyUser(searchclauseset.sctext,'debug'); 1302 searchclauseset.buildfromquerystring(); 1303 1304 collections = query.collection; 1305 //$('#collection_list').attr("value",query.getcollectiontext("name")); 1306 collections_widget.load(query.collection); 1307 //$('#columns_list').attr("value",query.columns); 1308 columns_widget.load(query.columns.split(',')); 1309 $('#input-simplequery').attr("value",query.squery); 1306 var q = jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq]; 1307 1308 loadQuery(q); 1310 1309 }); 1311 1310 $('#userqueries .cmd_del').live('click', function(event){ … … 1373 1372 1374 1373 1374 1375 } 1376 function loadQuery(q){ 1377 if (q["bookmark"] == "1") { 1378 var uri = "http://localhost:8080/MDService2/record/htmldetail/" + q["querystring"]; 1379 $.get(uri, showDetail,'html'); 1380 } else { 1381 hideWelcomeMessage(); 1382 var query = new Query([],"","",""); 1383 query.load(q); 1384 query.repository = getSelectedRepository(); 1385 queryset.addquery(query); 1386 1387 searchclauseset.sctext = query.query; 1388 notifyUser(searchclauseset.sctext,'debug'); 1389 searchclauseset.buildfromquerystring(); 1390 1391 collections = query.collection; 1392 collections_widget.load(query.collection); 1393 columns_widget.load(query.columns.split(',')); 1394 $('#input-simplequery').attr("value",query.squery); 1395 } 1375 1396 1376 1397 } -
MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js
r961 r1008 215 215 return ""; 216 216 } 217 querystring = Url.decode(querystring); 218 217 219 var arr_and = querystring.split(" and "); 218 220 var simple_form = ""; -
MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Admin.java
r998 r1008 37 37 private static String config_path = "mdservice.properties"; 38 38 private static Properties config; 39 public 39 public static Logger log = Logger.getLogger("Admin.class"); 40 40 41 41 public static String FATAL = "fatal"; … … 233 233 } 234 234 public static void notifyUser(String msg, String type ) { 235 //Logger log = Logger.getLogger("Admin.class"); 235 236 if (type.equals(Admin.FATAL)) { 236 237 log.fatal(msg); -
MDService2/trunk/MDService2/src/log4j.xml
r1000 r1008 8 8 <!-- <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/>--> 9 9 <!-- <param name="ConversionPattern" value="[%5p] %d{mm:ss} (%F:%M:%L)%n%m%n%n"/> --> 10 <param name="ConversionPattern" value="[%5p] % d{yyyy-MM-dd hh:mm:ss} : %m%n"/>10 <param name="ConversionPattern" value="[%5p] %c.%M %d{yyyy-MM-dd hh:mm:ss} : %m%n"/> 11 11 <!-- --> 12 12 </layout> -
MDService2/trunk/MDService2/src/xsl/mdset2view.xsl
r923 r1008 183 183 </a> 184 184 <span class="cmd cmd_detail" ></span> 185 185 <span class="cmd cmd_save" ></span> 186 186 </xsl:when> 187 187 <xsl:otherwise><xsl:value-of select="position()" /></xsl:otherwise>
Note: See TracChangeset
for help on using the changeset viewer.