X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdatamap.cc;h=e466082ec0949500bbe5b47c1b8732cf21be396a;hb=8d1b1714bb8e63a9d454e84454055500a17988b9;hp=19aaf44c95e788ef85f42fe753dd708810d55c5a;hpb=572bf1ef8d54ef5a7cba7cdf38515cb16c4c312c;p=laserbrain_demo

diff --git a/src/datamap.cc b/src/datamap.cc
index 19aaf44..e466082 100644
--- a/src/datamap.cc
+++ b/src/datamap.cc
@@ -1,10 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vector>
-#include <map>
-#include <string>
-//#include <regex>
 #include "datamap.h"
 
 #ifdef WIN32
@@ -15,23 +11,18 @@
 
 static char *clean_line(char *s);
 
-//static std::vector<std::pair<std::regex, std::string>> dmap;
-static std::vector<std::pair<std::string, std::string>> dmap;
-static std::map<std::string, std::string> cache;
-static std::string root;
-
-void datamap_reset()
+void DataMap::clear()
 {
 	dmap.clear();
 	cache.clear();
 }
 
-void datamap_set_path(const char *path)
+void DataMap::set_path(const char *path)
 {
 	root = std::string(path);
 }
 
-bool datamap_load_map(const char *fname)
+bool DataMap::load_map(const char *fname)
 {
 	std::string path = root.empty() ? fname : root + std::string("/") + fname;
 	fname = path.c_str();
@@ -49,7 +40,7 @@ bool datamap_load_map(const char *fname)
 		return false;
 	}
 
-	datamap_reset();
+	clear();
 
 	char *line;
 	int nline = 0;
@@ -83,22 +74,20 @@ bool datamap_load_map(const char *fname)
 
 err:
 	fprintf(stderr, "error while parsing %s, invalid line %d: %s\n", fname, nline, line);
-	datamap_reset();
+	clear();
 	fclose(fp);
 	return false;
 }
 
-void datamap_map(const char *re, const char *path)
+void DataMap::map(const char *match, const char *path)
 {
-	//std::pair<std::regex, std::string> mapping;
-	//mapping.first = std::regex(re);
 	std::pair<std::string, std::string> mapping;
-	mapping.first = std::string(re);
+	mapping.first = std::string(match);
 	mapping.second = std::string(path);
 	dmap.push_back(std::move(mapping));
 }
 
-int datamap_lookup(const char *in, char *buf, int bsz)
+int DataMap::lookup(const char *in, char *buf, int bsz) const
 {
 	std::string res;
 
@@ -112,7 +101,7 @@ int datamap_lookup(const char *in, char *buf, int bsz)
 		res = it->second;
 	} else {
 		// try matching with the available mappings
-		res = std::string(in);
+		res = root.empty() ? std::string(in) : root + "/" + std::string(in);
 
 		int num = dmap.size();
 		for(int i=0; i<num; i++) {
@@ -130,14 +119,14 @@ int datamap_lookup(const char *in, char *buf, int bsz)
 	if(buf) {
 		int n = std::min(bsz - 1, (int)res.length());
 		memcpy(buf, res.c_str(), n);
-		buf[bsz - 1] = 0; // make sure it's null-terminated even if it got truncated
+		buf[n] = 0; // make sure it's null-terminated even if it got truncated
 	}
 	return res.length() + 1;
 }
 
-int datamap_path_size(const char *in)
+int DataMap::path_size(const char *in) const
 {
-	return datamap_lookup(in, 0, 0);
+	return lookup(in, 0, 0);
 }
 
 static char *clean_line(char *s)