flora-commits Mailing List for Flora-2

Update of /cvsroot/flora/flora2/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8917/docs

Modified Files:
	flora2.tex flora-protege.tex flora-flrxml.tex 
	flora-flrjava.tex 
Log Message:
minor fixes


Index: flora-flrjava.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-flrjava.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flora-flrjava.tex	16 Sep 2005 03:22:36 -0000	1.2
+++ flora-flrjava.tex	16 Feb 2006 07:33:52 -0000	1.3
@@ -1,6 +1,6 @@
 
 
-    \chapter{JAVA Interface for \FLORA\\by Aditi Pandit}
+    \chapter{JAVA Interface for \FLORA\\{by Aditi Pandit}}
 
 
      This chapter documents the API for accessing \FLORA from a Java program.
@@ -445,19 +445,13 @@
 \item Download J2SE 1.4.2 (or newer) from
   {\tt http://java.sun.com/j2se/},
 and install it in some directory, say {\tt MY\_JAVA\_DIR}.
-\item XSB needs to be configured in a special way
+\item On Linux and other Unix-based systems,
+  XSB needs to be configured in a special way
 in order to interoperate with InterProlog. To build XSB with
 InterProlog support, run the following commands in the {\tt build}
 directory of XSB ({\tt MY\_JAVA\_DIR} is the directory in which java
 is installed). The {\tt configure} script needs to be run only on Linux and
-other Unix-based systems.\footnote{
-  Windows binaries usually come preconfigured for Interprolog. If you need
-  to rebuild XSB nonetheless, you would need Cygwin installed on your
-  Windows machine in order to run the configure script. In the configure
-  command, you will need to change
-  {\tt MY\_JAVA\_DIR/includes/linux} to {\tt
-    MY\_JAVA\_DIR$\backslash$include$\backslash$win32} and also add the option {\tt --with-wind}.
-}
+other Unix-based systems.
 %%
 \begin{verbatim}
 ./configure --with-interprolog
@@ -469,6 +463,32 @@
 {\tt --site-includes} is needed only if Java is installed in a non-standard
 place where {\tt configure} cannot find it automatically.
 
+Under Cygwin, XSB also needs to be configured as above, but the last step,
+{\tt ./makexsb dynmodule} is not required.  
+
+\item Under Windows, XSB is distributed preconfigured for use with
+  Interprolog. However, if you still need to rebuild it, use the following
+  command sequence. First, you would need to configure XSB \emph{under
+    Cygwin} (it is not possible to configure it under native Windows!) in a
+  Cygwin terminal window.  
+  %% 
+\begin{verbatim}
+./configure --with-interprolog
+            --with-wind
+            --site-includes='MY_JAVA_DIR\includes MY_JAVA_DIR\includes\win32'
+\end{verbatim}
+  %% 
+  The path names in {\tt --site-include} must be Windows path names.
+
+  Then, in a Windows (not Cygwin) command terminal, type:
+  %% 
+\begin{verbatim}
+makexsb_wind  
+\end{verbatim}
+  %% 
+  Note: this requires that {\tt nmake} and the C++ compiler is available on
+  your system. See the \FLORA manual, Section 1, for the instructions on
+  obtaining these programs.
 \item Rebuild \FLORA with the new XSB binary obtained in the
 previous step.
 \item Get InterProlog from {\tt http://www.declarativa.com/interprolog/}

Index: flora2.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora2.tex,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- flora2.tex	26 Dec 2005 03:47:57 -0000	1.148
+++ flora2.tex	16 Feb 2006 07:33:51 -0000	1.149
@@ -3255,6 +3255,9 @@
 the same name already exists. (In a program, include
 {\tt flora\_exceptions.flr} to define {\tt DB\_EXCEPTION}; in the shell, use
 the symbol {\tt '\_\$flora\_db\_error'}.) 
+Note that this command works only with database systems that understand the
+SQL command {\tt CREATE DATABASE}. For instance, MS-Access does not support
+this command and will issue a query.  
 
 The {\tt flDBConnect} associates a module with a database. It assumes that
 the {\em database} already exists and throws an exception of the form

Index: flora-protege.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-protege.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flora-protege.tex	16 Sep 2005 03:22:36 -0000	1.2
+++ flora-protege.tex	16 Feb 2006 07:33:52 -0000	1.3
@@ -1,7 +1,7 @@
 
 
-    \chapter{A \Protege Plug-In for Editing  \FLORA Knowledge Bases\\ by
-      Aditi Pandit}
+    \chapter{A \Protege Plug-In for Editing  \FLORA Knowledge Bases\\
+      {by Aditi Pandit}}
 
     This chapter documents the \Protege plug-in that enables visual editing of
     \FLORA classes and instances. The plug-in appears as a tab in the \Protege
@@ -19,13 +19,13 @@
 \FLORA system is also supported.
 
 For example, suppose that the following \FLORA class and instances
-are loaded in module {\tt basic\_mod}:
+are loaded in module {\tt foo\_mod}:
 
 \begin{verbatim}
 foo[
     ancestors=>person,
-    age(year)*=>num,
-    salary(year,month)=>num
+    age(year)*=>number,
+    salary(year,month)=>number
 ].
 
 john:foo.
@@ -39,15 +39,15 @@
 \underline{{\bf Representation of the class {\tt foo}}}
 
  The \fl class {\tt foo} is represented by \Protege class {\tt
-foo@basic\_mod}, which is a subclass of {\tt :FLORACLASS}.
+foo@foo\_mod}, which is a subclass of {\tt :FLORACLASS}.
 
-The \Protege class {\tt foo@basic\_mod} has slots {\tt age}, {\tt
+The \Protege class {\tt foo@foo\_mod} has slots {\tt age}, {\tt
   ancestors} and {\tt salary}, which represent the corresponding \fl
 methods. It also has a slot called {\tt floraOID}. This slot is
 needed to remember the OID of the corresponding \FLORA object, since
 \Protege generates its own OIDs, which are different from \FLORA's.
 For instance, if {\tt john:foo} is in \FLORA, then \Protege instance
-of the \Protege class {\tt foo@basic\_mod} that corresponds to
+of the \Protege class {\tt foo@foo\_mod} that corresponds to
 (\FLORA's) {\tt john} will have \Protege OID that looks like
 \emph{Kb\_0064}, but the slot {\tt
   floraOID} will have the value {\tt john}. In this way, it is possible
@@ -56,14 +56,14 @@
 
 \underline{{\bf Representation of the method {\tt age}  of {\tt foo}}}
 
-The \Protege class {\tt foo@basic\_mod} has a slot {\tt age} to represent
+The \Protege class {\tt foo@foo\_mod} has a slot {\tt age} to represent
 the \fl method {\tt age} of class {\tt foo}.  The slot {\tt age} has type
-{\tt foo\_age@basic\_mod} (which is a subclass of {\tt :FLORAMETHOD}). It
+{\tt foo\_age@foo\_mod} (which is a subclass of {\tt :FLORAMETHOD}). It
 has the following slots:
 \begin{itemize}
-\item {\tt par\_year} representing the year parameter passed
+\item {\tt Parameter\_year} representing the year parameter passed
 to the corresponding \fl method.
-\item {\tt val\_integer}
+\item {\tt Value\_integer}
 representing the returned value of age.
 \item {\tt single} representing that the \fl method returns a single value.
 \item {\tt inheritable} representing the fact that the
@@ -75,29 +75,30 @@
       foo}}}
 
 
-The \Protege class {\tt foo@basic\_mod} has a slot {\tt ancestors} to
+The \Protege class {\tt foo@foo\_mod} has a slot {\tt ancestors} to
 represent the \fl method {\tt ancestors} of class {\tt foo}. The slot {\tt
-  ancestors} of class {\tt foo@basic\_mod} has type {\tt
-  foo\_ancestors@basic\_mod} (which is a subclass of {\tt :FLORAMETHOD}). It has the
+  ancestors} of class {\tt foo@foo\_mod} has type {\tt
+  foo\_ancestors@foo\_mod} (which is a subclass of {\tt :FLORAMETHOD}). It has the
 following slots :
 \begin{itemize}
-\item {\tt val\_person}
+\item {\tt Value\_person}
 representing the returned person types.
 \end{itemize}
 
 \underline{{\bf Representation of the method {\tt salary}  of class {\tt
       foo}}}
 
- The \Protege class {\tt foo@basic\_mod} has a slot {\tt salary} to represent
-the \fl method {\tt salary} of class {\tt foo}. The slot salary has type
-{\tt foo\_salary@basic\_mod}, which is a subclass of {\tt :FLORAMETHOD}. It
+ The \Protege class {\tt foo@foo\_mod} has a slot {\tt salary} to represent
+the \fl method {\tt salary} of class {\tt foo}. The slot {\tt salary}  is
+represented by an object of type
+{\tt foo\_salary@foo\_mod}, which is a subclass of {\tt :FLORAMETHOD}. It
 has the following slots :
 \begin{itemize}
-\item {\tt par\_year} representing the year parameter passed
+\item {\tt Parameter\_year} representing the year parameter passed
 to the corresponding \fl method.
-\item {\tt par\_month} representing the month parameter passed
+\item {\tt Parameter\_month} representing the month parameter passed
 to the corresponding \fl method.
-\item {\tt val\_num}
+\item {\tt Value\_number}
 representing the returned value of salary.
 \item {\tt single} representing that the \fl method returns a single value.
 \end{itemize}
@@ -105,8 +106,8 @@
 \underline{{\bf Representation of the instance information}}
 
  Any instance of the \FLORA class {\tt foo} that is loaded into module
-{\tt basic\_mod} will be represented in \Protege as an instance of
-the class {\tt foo@basic\_mod}. Any method that is
+{\tt foo\_mod} will be represented in \Protege as an instance of
+the class {\tt foo@foo\_mod}. Any method that is
 declared for class {\tt foo}  will be
 available as a slot of that instance. The method
 will be represented in the \Protege knowledge base as an object that is
@@ -122,10 +123,10 @@
 will be represented using the following instances in \Protege:
 
 \begin{itemize}
-\item The \Protege class {\tt foo@basic\_mod} will have an instance with
+\item The \Protege class {\tt foo@foo\_mod} will have an instance with
 {\tt floraOID}  having the value {\tt john}.
 \item That instance
-  will have a slot {\tt age}  of type {\tt foo\_age@basic\_mod}.
+  will have a slot {\tt age}  of type {\tt foo\_age@foo\_mod}.
   This slot represents the \FLORA method {\tt age} with one argument.
   The value of this slot is an object of
   class {\tt foo\_age@foo\_mod}. This object will have an attribute
@@ -133,8 +134,8 @@
   Numeric suffixes, such as \_0, are added to each object that represents
   a method in order to disambiguate the methods that have the
   same names but different numbers of parameters.
-\item {\tt john\_age\_0} will have a slot {\tt par\_year} whose value is a
-  1995, and a slot {\tt val\_integer} that has value 29.
+\item {\tt john\_age\_0} will have a slot {\tt Parameter\_year} whose value is a
+  1995, and a slot {\tt Value\_integer} that has value 29.
 \end{itemize}
 
 \section{Conventions Used in Translation}

Index: flora-flrxml.tex
===================================================================
RCS file: /cvsroot/flora/flora2/docs/flora-flrxml.tex,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flora-flrxml.tex	5 Aug 2005 22:16:52 -0000	1.6
+++ flora-flrxml.tex	16 Feb 2006 07:33:52 -0000	1.7
@@ -1,4 +1,4 @@
-\chapter{SGML/XML Parser for \FLORA\\ by Rohan Shirwaikar}
+\chapter{SGML/XML Parser for \FLORA\\ {by Rohan Shirwaikar}}
 
 
 

Update of /cvsroot/flora/flora2/syslib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8917/syslib

Modified Files:
	flrdbmodule.P 
Log Message:
minor fixes


Index: flrdbmodule.P
===================================================================
RCS file: /cvsroot/flora/flora2/syslib/flrdbmodule.P,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flrdbmodule.P	24 Jan 2006 06:08:16 -0000	1.4
+++ flrdbmodule.P	16 Feb 2006 07:33:50 -0000	1.5
@@ -43,11 +43,11 @@
 #define	 FL_TRUE	      true
 
 %%query types for error messages.
-#define	 DB_CONNECT	'Connect to Database'
-#define	 DB_CREATE	'Creation of Database'
-#define	 DB_INSERT	'Insert into Database'
-#define	 DB_DELETE	'Delete from Database'
-#define	 DB_SELECT	'Query from Database'
+#define	 DB_CONNECT	'connect to database'
+#define	 DB_CREATE	'create database'
+#define	 DB_INSERT	'insert into database'
+#define	 DB_DELETE	'delete from database'
+#define	 DB_SELECT	'query database'
 
 
 :- import
@@ -57,7 +57,12 @@
   from flrregistry.
 
 :- import load_driver/1 from dbdrivers.
-:- import db_connect/5, db_disconnect/1, db_sql/4, db_statement_close/1 from db_interface.
+:- import
+	db_connect/5,
+	db_disconnect/1,
+	db_sql/4,
+	db_statement_close/1
+   from db_interface.
 :- import 
 	flora_user_module_predicate/4, 
 	flora_decode_predicate/7,
@@ -534,13 +539,13 @@
 	    flora_db_ddl_query_error(DB_CONNECT,Database,Mesg)
 	).
 
-%%ddl -> 'Data Definition Language'. Queries of the form of create table, use database. 
-%%No predicate associated with this type of query. Object = db/ table name
+%% ddl -> 'Data Definition Language'. Queries of the form CREATE TABLE.
+%% No predicate associated with this type of query. Object = db/ table name
 flora_db_ddl_sql(Connhandle, QueryHandle, SQLQueryList, ReturnList, QueryType, Object) :-
 	catch(db_sql(Connhandle, QueryHandle, SQLQueryList, ReturnList),
-	      xsb_error(database(Number), Mesg), error_handler(Number, Mesg)),
-	(var(Mesg) -> 
-	    true
+	      xsb_error(database(Number), Mesg),
+	      error_handler(Number, Mesg)),
+	(var(Mesg) -> true
 	;
 	    flora_db_ddl_query_error(QueryType,Object,Mesg)
 	).