change rMOTORVAR constant value.

diff --git a/lib/motorconst.h b/lib/motorconst.h
index f9ffdde..772540f 100644 (file)
--- a/lib/motorconst.h
+++ b/lib/motorconst.h
@@ -1,7 +1,7 @@
 #ifndef MOTORCONST_H
 #define MOTORCONST_H
 
-#define  rMOTORVAR     "[a-zA-Z_0-9][a-zA-Z_0-9-]*"
+#define  rMOTORVAR     "[a-zA-Z_0-9][a-zA-Z_0-9+*-]*"
 #define  rWIKIVAR      "[a-zA-Z_][a-zA-Z_0-9-]*"
 #define  rWikiID       "[a-zA-Z_][a-zA-Z_0-9-]*"
 #define  kWORD         "[a-zA-Z0-9_]"

diff --git a/modules/ml-store.cc b/modules/ml-store.cc
index 3e53d78..61ae1b1 100644 (file)
--- a/modules/ml-store.cc
+++ b/modules/ml-store.cc
@@ -73,18 +73,6 @@ ustring  StoreType::src (MlEnv* mlenv, const ustring& name) {
        return mlenv->env->path_storage_file (name);
     case F_STATIC:
        return mlenv->env->path_static_file (name);
-#if 0
-       {
-           ustring  ans;
-           if (! checkResourceName (name))
-               throw (name + uErrorBadFile);
-           if (mlenv->env->path_resource (name, ans)) {
-           } else {
-               throw (name + uErrorNotFound);
-           }
-           return ans;
-       }
-#endif
     default:
        throw (uErrorNoStore);
     }