add internal accessors

diff --git a/org.glite.jobid.api-c/interface/cjobid.h b/org.glite.jobid.api-c/interface/cjobid.h
index 03fc436..aff406d 100755 (executable)
--- a/org.glite.jobid.api-c/interface/cjobid.h
+++ b/org.glite.jobid.api-c/interface/cjobid.h
@@ -107,6 +107,14 @@ char* glite_jobid_getServer(glite_jobid_const_t jobid);
 void glite_jobid_getServerParts(glite_jobid_const_t jobid, char **srvName, unsigned int *srvPort);
 
 /**
+ * Extract bookkeeping server address and port
+ * \param jobid from which the bkserver address should be extracted
+ * \param srvName pointer where to return server name
+ * \param srvPort pointer where to return server port
+ *     */
+void glite_jobid_getServerParts_internal(glite_jobid_const_t jobid, char **srvName, unsigned int *srvPort);
+
+/**
  * Extract unique string 
  * \param jobid
  * \retval pointer to allocated unique string representing jobid
@@ -114,6 +122,14 @@ void glite_jobid_getServerParts(glite_jobid_const_t jobid, char **srvName, unsig
  */
 char* glite_jobid_getUnique(glite_jobid_const_t jobid);
 
+/**
+ * Extract unique string 
+ * \param jobid
+ * \retval pointer to allocated unique string representing jobid
+ * \retval NULL if jobid is 0 or memory allocation fails
+ */
+char* glite_jobid_getUnique_internal(glite_jobid_const_t jobid);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/org.glite.jobid.api-c/src/cjobid.c b/org.glite.jobid.api-c/src/cjobid.c
index ad8f2a3..7ff320c 100644 (file)
--- a/org.glite.jobid.api-c/src/cjobid.c
+++ b/org.glite.jobid.api-c/src/cjobid.c
@@ -62,6 +62,7 @@ int glite_jobid_recreate(const char* bkserver, int port, const char *unique, gli
 
     /* check if it begins with prefix */
     /* unsupported */
+    /* FIXME: fill in PROTO_PREFIX if missing */
     if (strncmp(bkserver, GLITE_JOBID_PROTO_PREFIX, sizeof(GLITE_JOBID_PROTO_PREFIX)-1) == 0)
         return EINVAL;
 
@@ -123,7 +124,7 @@ int glite_jobid_dup(glite_jobid_const_t in, glite_jobid_t *out)
 // XXX
 // use recreate
 // parse name, port, unique
-int glite_jobid_recreate(const char *idString, glite_jobid_t *jobId)
+int glite_jobid_parse(const char *idString, glite_jobid_t *jobId)
 {
     char *pom, *pom1, *pom2;
     glite_jobid_t out;
@@ -256,3 +257,18 @@ char* glite_jobid_getUnique(glite_jobid_const_t jobid)
 {
     return jobid ? strdup(jobid->id) : NULL;
 }
+
+
+void glite_jobid_getServerParts_internal(glite_jobid_const_t jobid, char **srvName, unsigned int *srvPort)
+{
+    if (jobid) {
+       *srvName = jobid->BShost;
+       *srvPort = jobid->BSport ? jobid->BSport : GLITE_JOBID_DEFAULT_PORT;
+    }
+}
+
+
+char* glite_jobid_getUnique_internal(glite_jobid_const_t jobid)
+{
+    return jobid ? jobid->id : NULL;
+}