[isidorus-cvs] r82 - in trunk/src: ajax/javascripts rest_interface

[Lukas Giessmann]

Author: lgiessmann
Date: Tue Jun 30 09:21:53 2009
New Revision: 82

Log:
ajax-client: fixed some info-messages when the client requests something

Modified:
   trunk/src/ajax/javascripts/requests.js
   trunk/src/rest_interface/set-up-json-interface.lisp

Modified: trunk/src/ajax/javascripts/requests.js
==============================================================================
--- trunk/src/ajax/javascripts/requests.js	(original)
+++ trunk/src/ajax/javascripts/requests.js	Tue Jun 30 09:21:53 2009
@@ -89,12 +89,20 @@
     try{
 	var onFailure = onFailureHandler ? onFailureHandler : defaultFailureHandler;
 	var timeFun = setAjaxTimeout(TIMEOUT, TYPE_PSIS_URL);
-	onLoad("Requesting all type PSIs");
-
+	
 	var url = ALL_PSIS_URL;
+	var message = "Requesting all type PSIs";
 	if(what && what.types && what.types === true) url = TYPE_PSIS_URL;
-	else if(what && what.instances && what.instances === true) url = INSTANCE_PSIS_URL;
-	else if(what && what.all && what.all === true) url = ALL_PSIS_URL;
+	else if(what && what.instances && what.instances === true){
+	    url = INSTANCE_PSIS_URL;
+	    message = "Requesting all instance PSIs";
+	}
+	else if(what && what.all && what.all === true){
+	    url = ALL_PSIS_URL;
+	    message = "Requesting all PSIs";
+	}
+
+	onLoad(message);
 
 	new Ajax.Request(url, {
 	    "method" : "get",

Modified: trunk/src/rest_interface/set-up-json-interface.lisp
==============================================================================
--- trunk/src/rest_interface/set-up-json-interface.lisp	(original)
+++ trunk/src/rest_interface/set-up-json-interface.lisp	Tue Jun 30 09:21:53 2009
@@ -19,7 +19,7 @@
 (defparameter *json-get-type-tmcl-url* "/json/tmcl/type/?$") ;the json url for getting some tmcl information of a topic treated as a type
 (defparameter *json-get-instance-tmcl-url* "/json/tmcl/instance/?$") ;the json url for getting some tmcl information of a topic treated as an instance
 (defparameter *json-get-overview* "/json/tmcl/overview/?$") ; returns a json-object representing a tree view
-(defparameter *ajax-user-interface-url* "/isidorus/?$") ;the url to the user interface; if you want to get all topics set start=0&end=nil -> localhost:8000/isidorus
+(defparameter *ajax-user-interface-url* "/isidorus/?$") ;the url to the user interface;
 (defparameter *ajax-user-interface-css-prefix* "/css") ;the url to the css files of the user interface
 (defparameter *ajax-user-interface-css-directory-path* "ajax/css") ;the directory contains the css files
 (defparameter *ajax-user-interface-file-path* "ajax/isidorus.html") ;the file path to the HTML file implements the user interface