Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20990/xrpc/admin
Modified Files:
admin.js admin.xq
Log Message:
- mapi-prefix PF warnings with # not !
- fix some bugs in admin console (view bug, BUNhead error)
Index: admin.xq
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.xq,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- admin.xq 4 May 2007 13:12:30 -0000 1.7
+++ admin.xq 27 May 2007 23:44:00 -0000 1.8
@@ -89,7 +89,7 @@
{ pf:mil('lock_set(pf_short); var ret := bat(str,str); var tot := 0LL; [EMAIL
PROTECTED]() tot :+= sum([batsize]($t)); ret.insert("xquery_index_curMB",
str(tot/1048576LL)); tot :=
doc_timestamp.select(timestamp_nil,timestamp_nil).reverse();
ret.insert("xquery_cache_curdocs", str(count(tot))); tot :=
tot.join(doc_collection).tunique().reverse().join(collection_size).sum();
ret.insert("xquery_cache_curMB", str(tot/1048576LL));
ret.insert("xquery_log_curMB", str((logger_changes(pf_logger) -
logger_base)/131072)); ret.insert("gdk_vm_cursize", str(vm_cursize()));
ret.insert("gdk_mem_cursize", str(mem_cursize())); lock_unset(pf_short); return
ret;') };
declare function admin:db-env()
-{ pf:mil('return
environment().copy().delete("exec_prefix").delete("prefix").delete("gdk_debug").delete("gdk_embedded").delete("gdk_vm_minsize").delete("mapi_debug").delete("mapi_noheaders").delete("monet_daemon").delete("monet_mod_path").delete("monet_pid").delete("monet_prompt").delete("monet_welcome").delete("sql_debug").delete("sql_logdir").insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
+{ pf:mil('return
environment().copy().access(BAT_WRITE).delete("exec_prefix").delete("prefix").delete("gdk_debug").delete("gdk_embedded").delete("gdk_vm_minsize").delete("mapi_debug").delete("mapi_noheaders").delete("monet_daemon").delete("monet_mod_path").delete("monet_pid").delete("monet_prompt").delete("monet_welcome").delete("sql_debug").delete("sql_logdir").insert("gdk_mem_maxsize",
str(mem_maxsize())).sort();') };
declare function admin:db-restart()
{ pf:mil('fork({ sleep(5); exit();}); return "Mserver will restart in 5
seconds..";') };
Index: admin.js
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- admin.js 4 May 2007 13:16:13 -0000 1.8
+++ admin.js 27 May 2007 23:44:00 -0000 1.9
@@ -94,7 +94,7 @@
dTableBody += '<td>'+url+'</td>\n';
dTableBody +=
'<td>'+
- '<input type="button" name="viewDoc" value="view"
onclick="open(\'/xrpc/doc'+docName+'\',\'_blank\',\'scrollbars=yes,resizable=yes,directories=no,location=no,titlebar=no,toolbar=no\')"/>'+
+ '<input type="button" name="viewDoc" value="view"
onclick="open(\'/xrpc/doc/'+docName+'\',\'_blank\',\'scrollbars=yes,resizable=yes,directories=no,location=no,titlebar=no,toolbar=no\')"/>'+
'</td>\n';
dTableBody +=
'<td>'+
@@ -141,7 +141,7 @@
dTableBody += '<td>'+url+'</td>\n';
dTableBody +=
'<td>'+
- '<input type="button" name="viewDoc" value="view"
onclick="open(\'/'+docName+'\',\'_blank\',\'scrollbars=yes,resizable=yes,directories=no,location=no,titlebar=no,toolbar=no\')"/>'+
+ '<input type="button" name="viewDoc" value="view"
onclick="open(\'/xrpc/doc/'+docName+'\',\'_blank\',\'scrollbars=yes,resizable=yes,directories=no,location=no,titlebar=no,toolbar=no\')"/>'+
'</td>\n';
dTableBody +=
'<td>'+
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
