- xml stuff looks like its working again

- additions to das to cope.

src/zmapServer/das/das1features.c

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Sep  8 17:28 2005 (rds)
+ * Last edited: Sep 16 11:11 2005 (rds)
  * Created: Wed Aug 31 18:37:38 2005 (rds)
- * CVS info:   $Id: das1features.c,v 1.2 2005-09-08 17:45:35 rds Exp $
+ * CVS info:   $Id: das1features.c,v 1.3 2005-09-20 17:16:11 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -37,6 +37,12 @@
 #include <ZMap/zmapFeature.h>
 
 
+typedef struct _dasOneGroupStruct
+{
+  GQuark id;
+  GQuark type;
+  GQuark label;
+} dasOneGroupStruct;
 
 
 typedef struct _dasOneMethodStruct
@@ -66,7 +72,7 @@ typedef struct _dasOneFeatureStruct
   GQuark label;
   int start;
   int stop;
-  float score;
+  double score;
 
   ZMapStrand orientation;
   ZMapPhase phase;
@@ -118,33 +124,15 @@ gboolean dasOneFeature_getLocation(dasOneFeature feature,
 
 void dasOneFeature_setProperties(dasOneFeature feature, 
                                  int start, int stop,
-                                 double score, char *orientation,
-                                 int phase)
+                                 char *score, char *orientation,
+                                 char *phase)
 {
   feature->start = start;
   feature->stop  = stop;
-  feature->score = score;
-
-  if(orientation && *orientation && (g_quark_from_string(orientation) == g_quark_from_string("-")))
-    feature->orientation = ZMAPSTRAND_REVERSE;
-  else
-    feature->orientation = ZMAPSTRAND_FORWARD;
 
-  switch(phase)
-    {
-    case 0:
-      feature->phase = ZMAPPHASE_0;
-      break;
-    case 1:
-      feature->phase = ZMAPPHASE_1;
-      break;
-    case 2:
-      feature->phase = ZMAPPHASE_2;
-      break;
-    default:
-      feature->phase = ZMAPPHASE_NONE;
-      break;
-    }
+  zMapFeatureFormatScore(score, &(feature->score));
+  zMapFeatureFormatStrand(orientation, &(feature->orientation));
+  zMapFeatureFormatPhase(phase, &(feature->phase));
 
   return ;
 }
@@ -300,3 +288,21 @@ void dasOneTarget_free(dasOneTarget target)
     g_free(target);
   return ;
 }
+
+
+dasOneGroup dasOneGroup_create1(GQuark id, GQuark type, GQuark label)
+{
+  dasOneGroup grp = NULL;
+
+  grp = g_new0(dasOneGroupStruct, 1);
+
+  grp->id    = id;
+  grp->type  = type;
+  grp->label = label;
+
+  return grp;
+}
+GQuark dasOneGroup_id1(dasOneGroup grp)
+{
+  return grp->id;
+}

src/zmapServer/das/das1schema.h

@@ -27,9 +27,9 @@
  *
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Sep  8 18:53 2005 (rds)
+ * Last edited: Sep 15 18:15 2005 (rds)
  * Created: Wed Aug 31 15:59:12 2005 (rds)
- * CVS info:   $Id: das1schema.h,v 1.3 2005-09-08 18:12:57 rds Exp $
+ * CVS info:   $Id: das1schema.h,v 1.4 2005-09-20 17:16:11 rds Exp $
  *-------------------------------------------------------------------
  */
 
@@ -90,6 +90,8 @@ typedef struct _dasOneStylesheetStruct
   dasOneGlyph glyph;
 }dasOneStylesheetStruct, *dasOneStylesheet;
 
+typedef struct _dasOneGroupStruct *dasOneGroup;
+
 typedef struct _dasOneMethodStruct *dasOneMethod;
 
 typedef struct _dasOneTargetStruct *dasOneTarget;
@@ -173,8 +175,8 @@ gboolean dasOneFeature_getLocation(dasOneFeature feature,
                                   int *start_out, int *stop_out);
 void dasOneFeature_setProperties(dasOneFeature feature, 
                                  int start, int stop,
-                                 double score, char *orientation,
-                                 int phase);
+                                 char *score, char *orientation,
+                                 char *phase);
 void dasOneFeature_setTarget(dasOneFeature feature, 
                              dasOneTarget target);
 gboolean dasOneFeature_getTargetBounds(dasOneFeature feature, 
@@ -201,5 +203,9 @@ void dasOneMethod_free(dasOneMethod meth);
 dasOneTarget dasOneTarget_create1(GQuark id, int start, int stop);
 void dasOneTarget_free(dasOneTarget target);
 
+/* ============= */
+/* Group Methods */
+dasOneGroup dasOneGroup_create1(GQuark id, GQuark type, GQuark label);
+GQuark dasOneGroup_id1(dasOneGroup grp);
 
 #endif /* DAS1SCHEMA_H */

src/zmapServer/das/dasServer_P.h

@@ -24,9 +24,9 @@
  *
  * Description: 
  * HISTORY:
- * Last edited: Sep  8 16:17 2005 (rds)
+ * Last edited: Sep 14 16:20 2005 (rds)
  * Created: Thu Mar 18 12:02:52 2004 (edgrif)
- * CVS info:   $Id: dasServer_P.h,v 1.4 2005-09-08 17:45:36 rds Exp $
+ * CVS info:   $Id: dasServer_P.h,v 1.5 2005-09-20 17:16:11 rds Exp $
  *-------------------------------------------------------------------
  */
 #ifndef DAS_SERVER_P_H
@@ -39,6 +39,10 @@
 #include <ZMap/zmapFeature.h>
 #include <das1schema.h>
 
+#define ZMAP_DAS_FORMAT_SEGMENT "segment=%s:%d,%d;"
+#define ZMAP_URL_FORMAT_UN_PWD "%s://%s:%s@%s:%d/%s/%s"
+#define ZMAP_URL_FORMAT        "%s://%s:%d/%s/%s"
+
 /* http://www.biodas.org/documents/spec.html */
 
 typedef enum {
@@ -83,6 +87,7 @@ typedef struct _DasServerStruct
   int chunks ;						    /* for debugging at the moment... */
 
   zmapXMLParser parser;
+  zmapXMLFactory factory;
   gboolean debug;
 
   /* error stuff... */
@@ -91,9 +96,9 @@ typedef struct _DasServerStruct
   char *last_errmsg ;					    /* The general das msg stuf, could be
                                                                curl could be my code. */
 
+  GList *hostAbilities;
   GList *dsn_list;
   dasOneSegment current_segment;
-  GHashTable *hashtable;
 
   /* this will not stay like this, it should more properly be a union of types of data that might
    * be returned.... */
@@ -109,6 +114,37 @@ gboolean checkDSNExists(DasServer das,
                         dasOneDSN *dsn);
 
 
+
+gpointer dsnStart(void *userData,
+                  zmapXMLElement element,
+                  gpointer storage,
+                  zmapXMLFactoryDetail detail);
+gpointer dsnEnd(void *userData,
+                zmapXMLElement element,
+                gpointer storage,
+                zmapXMLFactoryDetail detail);
+gpointer segStart(void *userData,
+                  zmapXMLElement element,
+                  gpointer storage,
+                  zmapXMLFactoryDetail detail);
+
+gpointer segEnd(void *userData,
+                zmapXMLElement element,
+                gpointer storage,
+                zmapXMLFactoryDetail detail);
+gpointer featStart(void *userData,
+                    zmapXMLElement element,
+                    gpointer storage,
+                   zmapXMLFactoryDetail detail);
+gpointer featEnd(void *userData,
+                 zmapXMLElement element,
+                 gpointer storage,
+                 zmapXMLFactoryDetail detail);
+gpointer cleanUpDoc(void *userData,
+                    zmapXMLElement element,
+                    gpointer storage,
+                    zmapXMLFactoryDetail detail);
+#ifdef OLDVERSION
 /* Parsing handlers (see das1handlers.c) */
 /* There is a pair of handlers for each DAS document type 
  * E.G one for DASDSN formatted xml (http://www.biodas.org/dtd/dasdsn.dtd)
@@ -137,6 +173,14 @@ gboolean typesEnd(void *userData,
                   zmapXMLElement element, 
                   zmapXMLParser parser);
 
+gboolean zmapFeaturesStart(void *userData, 
+                           zmapXMLElement element, 
+                           zmapXMLParser parser);
+gboolean zmapFeaturesEnd(void *userData, 
+                         zmapXMLElement element, 
+                         zmapXMLParser parser);
+
+
 /* Internal DAS Features Handlers */
 gboolean internalDasStart(void *userData, 
                           zmapXMLElement element, 
@@ -145,5 +189,6 @@ gboolean internalDasEnd(void *userData,
                         zmapXMLElement element, 
                         zmapXMLParser parser);
 
+#endif /* OLDVERSION */
 
 #endif /* !DAS_SERVER_P_H */