[Babeldoc-devel] babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage SqlEnrichPipelineStage.java,1.14,1.15 SqlQueryPipelineStage.java,1.4,1.5 SqlWriterPipelineStage.java,1.14,1.15

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage
In directory sc8-pr-cvs1:/tmp/cvs-serv6089/sql/src/com/babeldoc/sql/pipeline/stage

Modified Files:
	SqlEnrichPipelineStage.java SqlQueryPipelineStage.java 
	SqlWriterPipelineStage.java 
Log Message:
Resources now are Configurable.  Added dbDriver configuration option to sql resources.  Lots of work on the resources - made things more logical from a SW POV.  Added Null scanner.

Index: SqlEnrichPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlEnrichPipelineStage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15

Index: SqlQueryPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlQueryPipelineStage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SqlQueryPipelineStage.java	13 Aug 2003 22:44:30 -0000	1.4
--- SqlQueryPipelineStage.java	15 Aug 2003 00:25:30 -0000	1.5
***************
*** 126,130 ****
  
        public String getDescription() {
!         return I18n.get("sql.pipeline.stage.query.desc");
        }
  
--- 126,130 ----
  
        public String getDescription() {
!         return I18n.get("sql.900");
        }
  
***************
*** 132,144 ****
          ArrayList options = new ArrayList();
          options.add(new ConfigOption(RESOURCE_NAME, IConfigOptionType.STRING,
!             null, true, I18n.get("sql.pipeline.stage.query.option.resource")));
  
          IConfigOptionType queries = new ComplexConfigOptionType(new ConfigOption[]{
!           new ConfigOption(SQL, IConfigOptionType.MULTI, null, false,
!               I18n.get("sql.pipeline.stage.query.option.sql"))
          });
  
          options.add(new ConfigOption(SQL, queries,
!             null, false, I18n.get("sql.pipeline.stage.query.option.sql")));
  
          return options;
--- 132,143 ----
          ArrayList options = new ArrayList();
          options.add(new ConfigOption(RESOURCE_NAME, IConfigOptionType.STRING,
!             null, true, I18n.get("sql.901")));
  
          IConfigOptionType queries = new ComplexConfigOptionType(new ConfigOption[]{
!           new ConfigOption(SQL, IConfigOptionType.MULTI, null, false, I18n.get("sql.902"))
          });
  
          options.add(new ConfigOption(SQL, queries,
!             null, false, I18n.get("sql.106")));
  
          return options;
***************
*** 186,191 ****
        // Iterate through sqls
        if ((queries != null) && (queries.length > 0)) {
-         Element queryElement = root.addElement(QUERY);
          for (int i = 0; i < queries.length; ++i) {
            String queryName = queries[i].getName();
            queryElement.addAttribute(QUERY_NAME, queryName);
--- 185,190 ----
        // Iterate through sqls
        if ((queries != null) && (queries.length > 0)) {
          for (int i = 0; i < queries.length; ++i) {
+           Element queryElement = root.addElement(QUERY);
            String queryName = queries[i].getName();
            queryElement.addAttribute(QUERY_NAME, queryName);

Index: SqlWriterPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/sql/src/com/babeldoc/sql/pipeline/stage/SqlWriterPipelineStage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15