[Mathlib-commitlog] SF.net SVN: mathlib:[572] JMathLib/trunk/src/jmathlib/core/functions
Status: Beta
Brought to you by:
st_mueller
Menu
▾
▴
[Mathlib-commitlog] SF.net SVN: mathlib:[572] JMathLib/trunk/src/jmathlib/core/functions
|
From: <st_...@us...> - 2008-12-28 16:57:28
|
Revision: 572
http://mathlib.svn.sourceforge.net/mathlib/?rev=572&view=rev
Author: st_mueller
Date: 2008-12-28 16:57:25 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
moved code from MFileWebLoader to WebFunctionLoader
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java
JMathLib/trunk/src/jmathlib/core/functions/WebFunctionLoader.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java 2008-12-28 16:50:39 UTC (rev 571)
+++ JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java 2008-12-28 16:57:25 UTC (rev 572)
@@ -31,7 +31,7 @@
Applet applet = null;
// loader for m files via the web
- MFileWebLoader mWebLoader;
+ WebFunctionLoader webFunctionLoader;
/**Creates the function manager and defines any internal functions
if this is an application then it creates a class loader to load external functions
@@ -68,25 +68,8 @@
}
}
} else {
- try {
System.out.println("web:"+applet);
- System.out.println("web: new url"+ applet.getCodeBase().toString());
- URL url = new URL(applet.getCodeBase(), "jmathlib/webFunctionsList.dat");
- InputStream in = url.openStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
-
- // read each line of the functions list
- String line = null;
- while ((line = br.readLine()) != null) {
- System.out.println("read =" + line);
- if (!line.startsWith("#")) {
- functionLoaders.add(new MFileWebLoader(applet.getCodeBase(), line));
- }
- }
- } catch (Exception ex) {
- //ErrorLogger.debugLine("FunctionManager: applet error");
- ex.printStackTrace();
- }
+ functionLoaders.add(new WebFunctionLoader(applet.getCodeBase(), ""));
}
}
@@ -164,7 +147,7 @@
// use webloader
//Search for class, m or p file
for (int i = 0; i < functionLoaders.size(); i++) {
- FunctionLoader l = (FileFunctionLoader) functionLoaders.elementAt(i);
+ FunctionLoader l = (WebFunctionLoader) functionLoaders.elementAt(i);
func = l.findFunction(funcName);
if (func != null) {
Modified: JMathLib/trunk/src/jmathlib/core/functions/WebFunctionLoader.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/WebFunctionLoader.java 2008-12-28 16:50:39 UTC (rev 571)
+++ JMathLib/trunk/src/jmathlib/core/functions/WebFunctionLoader.java 2008-12-28 16:57:25 UTC (rev 572)
@@ -1,89 +1,204 @@
package jmathlib.core.functions;
-import java.util.Hashtable;
-//import java.io.IOException;
-//import java.io.File;
-//import java.io.FileInputStream;
-//import java.util.Vector;
import jmathlib.core.interpreter.*;
-//import java.net.*;
-//import java.security.*;
-import java.applet.*;
+import java.io.*;
+import java.net.*;
+import java.util.*;
-/**Class to load any External functions used*/
-public class WebFunctionLoader
+
+/**Class for storing and managing the m- and p-functions
+ *
+ * JMH Should be more aptly named "WebFunctionLoader"
+ */
+public class WebFunctionLoader extends FunctionLoader
{
- /**Root directory to load the class from*/
- //private String baseClassDir;
- /**Directory for the last loaded class*/
- public String classDir;
-
- /**name of the last class loaded*/
- public String lastClassName;
+ boolean pFileCachingEnabledB = false;
+ private URL codeBase;
+ private String directory;
+ private Vector pathV = new Vector(30); // paths to external function for applet usage
- /**name of the last script-file (m-file) */
- public boolean mFileSwitch;
+
+ /**Default constructor*/
+ public WebFunctionLoader(URL _codeBase, String _directory)
+ {
+ codeBase = _codeBase;
+ directory = _directory;
+
+ try {
+ System.out.println("WebFunctionLoader: new url"+ codeBase.toString());
+ URL url = new URL(codeBase, "jmathlib/webFunctionsList.dat");
+ InputStream in = url.openStream();
+ BufferedReader br = new BufferedReader(new InputStreamReader(in));
- /**Hashtable to store classes that have already been loaded*/
- private Hashtable loadedClasses;
+ // read each line of the functions list
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ System.out.println("read =" + line);
+ if (!line.startsWith("#")) {
+ pathV.addElement(line);
+ //functionLoaders.add(new MFileWebLoader(applet.getCodeBase(), line));
+ }
+ }
+ } catch (Exception ex) {
+ //ErrorLogger.debugLine("FunctionManager: applet error");
+ ex.printStackTrace();
+ }
- /**Pointer to the system flags*/
- //private Flags sysFlags;
+ }
- /**Pointer to applet context */
- //private Applet app;
+ public URL getCodeBase() {
+ return codeBase;
+ }
- public WebFunctionLoader()
- {
- //super(urls);
- //baseClassDir = _classDir;
-
- loadedClasses = new Hashtable();
+ public String getDirectory() {
+ return directory;
+ }
+
+ /**loads an .m-file via the web
+ @param directory = the directory containing the file
+ @param mFileName = the name of the m file
+ @return the result of the file as a FunktionToken*/
+ public Function findFunction(String functionName)
+ {
+ //JMH TBD find functions on the classpath
+
+
+ String code = "";
+ UserFunction function = (UserFunction)getCachedFunction(functionName);
+ if (function != null)
+ return function;
+
+ ErrorLogger.debugLine("WebFunctionLoader: loading >"+functionName+".m<");
+
+ boolean foundClassFileB = false;
+ boolean foundMFileB = false;
+ String functionPath = null;
+
+ // Search filelist for wanted function
+ for (int i=0; i<pathV.size(); i++)
+ {
+ // The searchstring is set to "/foo.class" to avoid matches
+ // of substring of some other function like "barfoo.class"
+ functionPath = ((String)pathV.elementAt(i));
+
+ // !! Remark: the command toLowerCase() is necessary, because some filenames have upper case letters (e.g. Disp.class)
+ if ( functionPath.toLowerCase().endsWith("/"+functionName+".class") )
+ {
+ foundClassFileB = true; // indicate that class file was found
+ functionPath = functionPath.substring(0,functionPath.length()-6);
+ functionPath = functionPath.replace('/', '.');
+ functionPath = functionPath.replace('\\', '.');
+ ErrorLogger.debugLine("WebFunctionLoader found "+functionPath);
+ break;
+ }
-// no function yet
+ if ( functionPath.toLowerCase().endsWith("/"+functionName+".m") )
+ {
+ // functionsPath contains the path AND the m-filename
+ foundMFileB = true; // indicate that m-file was found
+ ErrorLogger.debugLine("WebFunctionLoader found "+functionPath);
+ break;
+ }
+ } // end for
+
+ Function func;
+
+ // check if class was found and load it
+ try
+ {
+ if (foundClassFileB)
+ {
+ Class extFunctionClass = Class.forName(functionPath);
+ //Class extFunctionClass = Class.forName("MathLib.Functions.Matrix.ones");
+ Object funcObj = extFunctionClass.newInstance();
+
+ func = ((Function)funcObj);
+ return func;
+ }
+ }
+ catch(Exception exception)
+ {
+ exception.printStackTrace();
+ }
+
+
+ ErrorLogger.debugLine("WebFunctionLoader: webloader");
+ // check if m-file was found and load it
+ if (foundMFileB)
+ {
+ // load .m-file. could be script- or function-file
+ //UserFunction userFunc = mLoader.loadMFileViaWeb(applet.getCodeBase(),
+ // functionPath,
+ // funcName);
+ // open file and read m-file line by line
+ try
+ {
+ ErrorLogger.debugLine("WebFunctionLoader: "+codeBase+" "+directory+"/"+functionName+".m");
+ //URL url = new URL(codeBase, directory+"/"+functionName+".m");
+ URL url = new URL(codeBase, functionPath);
+
+ InputStream in = url.openStream();
+ BufferedReader inReader = new BufferedReader(new InputStreamReader(in));
+ String line;
+ while ((line = inReader.readLine()) != null)
+ {
+ ErrorLogger.debugLine("WebFunctionLoader: "+line);
+ code += line + "\n";
+ }
+ inReader.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ Errors.throwMathLibException("WebFunctionLoader: m-file exception via web");
+
+ }
+
+ ErrorLogger.debugLine("WebFunctionLoader: code: begin \n"+code+"\ncode end");
+
+ // send code to function parser and return function
+ FunctionParser funcParser = new FunctionParser();
+ function = funcParser.parseFunction(code);
+
+ // set name of user function
+ // remember: the name of the called function could be different compared
+ // to the function's name inside the m-file
+ function.setName(functionName);
+
+ //addUserFunction(userFunc);
+ cacheFunction(function);
+
+ ErrorLogger.debugLine("WebFunctionLoader: finished webloading >" + functionName + ".m<");
+
+ return function;
+ }
- }
+ return null;
+ }
+
+
+ /** set caching of p-file to on of off
+ *
+ * @param pFileCaching true= caching of p-files on; false: caching of p-files off
+ */
+ public void setPFileCaching(boolean pFileCaching)
+ {
+ pFileCachingEnabledB = pFileCaching;
+ }
- /**first checks the hashtable of already loaded classes
- @param fileName = the name of the function to load*/
- /*public boolean isClassLoaded(String fileName)
- {
- Class newClass = ((Class)loadedClasses.get(fileName.toUpperCase()));
- if (newClass != null) return true;
- else return false;
-
-// no function yet
-
- }*/
-
- public void setApplet(Applet _app)
+ /** return whether of not caching of p-files is enabled of not
+ *
+ * @return status of caching p-files
+ */
+ public boolean getPFileCaching()
{
- //app = _app;
+ return pFileCachingEnabledB;
}
-
- public Class loadClass(String fileName) throws ClassNotFoundException
- {
- ErrorLogger.debugLine("web func loader loadClass "+ fileName);
- Class newClass = ((Class)loadedClasses.get(fileName.toUpperCase()));
-
- if(newClass != null)
- {
- return newClass;
- }
-
- return newClass;
-// no function yet
-
- }
-
- //private String findClassOrMFile(String path, String fileName)
- //{
- // String classDir = "nothing";
- // return classDir;
-// no function yet
-
- //}
-}
+
+ public void checkAndRehashTimeStamps() {
+ //TODO: Add timestamp checks
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
