Added function to extract and parse the new //sqldata/@schemaver attribute

This attribute defines which version of the SQL database schema which is needed
for the SQL data found in the <sqldata/> document.  This is to avoid SQL failures
when inserting data which the database is not prepared for.

2 files changed, 32 insertions, 0 deletions

diff --git a/server/parser/xmlparser.c b/server/parser/xmlparser.c
index 8cf13a8..e7e31b1 100644
--- a/server/parser/xmlparser.c
+++ b/server/parser/xmlparser.c
@@ -412,3 +412,34 @@ xmlDoc *sqldataGetHostInfo(LogContext *log, xsltStylesheet *xslt, xmlDoc *summar
  exit:
 	return hostinfo_d;
 }
+
+int sqldataGetRequiredSchemaVer(LogContext *log, xmlNode *sqldata_root)
+{
+	char *schver = NULL, *cp = NULL, *ptr = NULL;
+	int majv = 0, minv = 0;
+
+	if( !sqldata_root || (xmlStrcmp(sqldata_root->name, (xmlChar *) "sqldata") != 0) ) {
+		writelog(log, LOG_ERR, "sqldataGetRequiredSchemaVer: Invalid document node");
+		return -1;
+	}
+
+	schver = xmlGetAttrValue(sqldata_root->properties, "schemaver");
+	if( schver == NULL ) {
+		return 100;  // If not defined, presume lowest available version.
+	}
+	cp = strdup(schver);
+	assert( cp != NULL );
+
+	if( (ptr = strpbrk(cp, ".")) != NULL ) {
+		*ptr = 0;
+		ptr++;
+		majv = atoi_nullsafe(cp);
+		minv = atoi_nullsafe(ptr);
+	} else {
+		majv = atoi_nullsafe(cp);
+		minv = 0;
+	}
+	free_nullsafe(cp);
+
+	return (majv * 100) + minv;
+}
diff --git a/server/parser/xmlparser.h b/server/parser/xmlparser.h
index 2c96fdf..f903037 100644
--- a/server/parser/xmlparser.h
+++ b/server/parser/xmlparser.h
@@ -45,4 +45,5 @@ int sqldataGetFid(LogContext *log, xmlNode *sqld, const char *fname);
 char *sqldataGetValue(LogContext *log, xmlDoc *sqld, const char *fname, int recid);
 xmlDoc *sqldataGetHostInfo(LogContext *log, xsltStylesheet *xslt, xmlDoc *summaryxml,
 			   int syskey, char **hostname, char **ipaddr);
+int sqldataGetRequiredSchemaVer(LogContext *log, xmlNode *sqldata_root);
 #endif