add CSharp Macker

maker/csharp/DbMaker/DbMaker.cs

@@ -125,11 +125,13 @@ public class DbMaker
         public void make(String dbFile)
         {
             //check and load the gloabl region
-		if ( globalRegionFile != null ) {
+            if (globalRegionFile != null)
+            {
                 Console.WriteLine("+-Try to load the global region data ...");
                 StreamReader greader = new StreamReader((globalRegionFile));
                 String gline = null;
-			while (!greader.EndOfStream ) {
+                while (!greader.EndOfStream)
+                {
                     gline = greader.ReadLine();// != null 
                     if (String.IsNullOrWhiteSpace(gline))
                     {
@@ -158,7 +160,8 @@ public class DbMaker
             //analysis main loop
             Console.WriteLine("+-Try to write the data blocks ... ");
             String line = null;
-		while ( !reader.EndOfStream ) {
+            while (!reader.EndOfStream)
+            {
                 //line = reader.ReadLine()
                 line = reader.ReadLine();
                 if (String.IsNullOrWhiteSpace(line))
@@ -177,7 +180,7 @@ public class DbMaker
                 //2. get the end ip
                 sIdx = eIdx + 1;
                 if ((eIdx = line.IndexOf('|', sIdx + 1)) == -1) continue;
-			String endIp = line.Substring(sIdx, eIdx);
+                String endIp = line.Substring(sIdx, eIdx - sIdx);
 
                 //3. get the region
                 sIdx = eIdx + 1;
@@ -205,8 +208,10 @@ public class DbMaker
             int counter = 0, shotCounter = (dbConfig.getIndexBlockSize() / blockLength) - 1;
             //Iterator<IndexBlock> indexIt = indexPool.iterator();
             //while ( indexIt.hasNext() ) {
-		foreach(var block in indexPool){
+            foreach (var block in indexPool)
-			if ( ++counter >= shotCounter ) {
+            {
+                if (++counter >= shotCounter)
+                {
                     hb = new HeaderBlock(
                         block.getStartIp(),
                         (int)raf.getFilePointer()
@@ -221,7 +226,8 @@ public class DbMaker
             }
 
             //record the end block
-		if ( counter > 0 ) {
+            if (counter > 0)
+            {
                 indexBlock = indexPool.Last();
                 hb = new HeaderBlock(
                     indexBlock.getStartIp(),
@@ -295,11 +301,14 @@ var timespan=		new DateTimeOffset(date).ToUnixTimeSeconds();
             raf.write(data);*/
 
             //check region ptr pool first
-		if ( regionPtrPool.containsKey(region) ) {
+            if (regionPtrPool.containsKey(region))
+            {
                 DataBlock dataBlock = regionPtrPool.get(region);
                 dataPtr = dataBlock.getDataPtr();
                 Console.WriteLine("dataPtr: " + dataPtr + ", region: " + region);
-		} else {
+            }
+            else
+            {
                 byte[] city = new byte[4];
                 int city_id = getCityId(region);
                 Util.writeIntLong(city, 0, city_id);
@@ -328,22 +337,30 @@ var timespan=		new DateTimeOffset(date).ToUnixTimeSeconds();
         */
         public int getCityId(String region)
         {
-		String[] p = region.Split("\\|");
+            String[] p = region.Split("|");
             if (p.Length != 5) return 0;
 
             String key = null;
             int? intv = null;
-		for ( int i = 3; i >= 0; i-- ) {
+            for (int i = 3; i >= 0; i--)
+            {
                 if (p[i].Equals("0")) continue;
                 if (i == 3
-				&& p[i].IndexOf("省直辖县级") > -1 ) {
+                    && p[i].IndexOf("省直辖县级") > -1)
+                {
                     key = p[2] + p[3];
-			} else {
+                }
+                else
+                {
                     key = p[i];
                 }
 
+                if (!globalRegionMap.ContainsKey(key))
+                {
+                    return 0;
+                }
                 intv = globalRegionMap.get(key);
-			if ( intv == null ) return 0;
+                //if (intv == null) return 0;
                 return intv.Value;
             }
 
@@ -380,22 +397,30 @@ var timespan=		new DateTimeOffset(date).ToUnixTimeSeconds();
         {
             String dstDir = "./data/";
             String[] path = new String[] { null, null };
-	    for ( int i = 0; i < args.Length; i++ ) {
+            for (int i = 0; i < args.Length; i++)
-	        if ( args[i].Equals("-src") ) {
+            {
+                if (args[i].Equals("-src"))
+                {
                     path[0] = args[++i];
-	        } else if ( args[i].Equals("-region") ) {
+                }
+                else if (args[i].Equals("-region"))
+                {
                     path[1] = args[++i];
-	        } else if ( args[i].Equals("-dst") ) {
+                }
+                else if (args[i].Equals("-dst"))
+                {
                     dstDir = args[++i];
                 }
             }
 
-	    for ( int i = 0; i < path.Length; i++ ) {
+            for (int i = 0; i < path.Length; i++)
-	        if ( path[i] == null ) {
+            {
-	            Console.WriteLine("Usage: java -jar dbMaker.jar "
+                if (path[i] == null)
+                {
+                    Console.WriteLine("Usage: DbMaker "
                             + "-src [source text file path] "
                             + "-region [global region file path]");
-	            Console.WriteLine("eg: java -jar dbMaker.jar "
+                    Console.WriteLine("eg: DbMaker "
                             + "-src ./data/ip.merge.txt -region ./data/origin/global_region.csv");
                     //System.exit(0);
                     Environment.Exit(0);
@@ -403,18 +428,28 @@ var timespan=		new DateTimeOffset(date).ToUnixTimeSeconds();
             }
 
             //check and stdlize the destination directory
-	    if ( ! dstDir.EndsWith("/") ) {
+            if (!dstDir.EndsWith("/"))
+            {
                 dstDir = dstDir + "/";
             }
 
-	    try {
+            try
+            {
+                if (!Directory.Exists(dstDir))
+                {
+                    Directory.CreateDirectory(dstDir);
+                }
                 DbConfig config = new DbConfig();
                 DbMaker dbMaker = new DbMaker(config, path[0], path[1]);
                 dbMaker.make(dstDir + "ip2region.db");
-        } catch (DbMakerConfigException e) {
+            }
+            catch (DbMakerConfigException e)
+            {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
-        } catch (IOException e) {
+            }
+            catch (IOException e)
+            {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
             }

maker/csharp/DbMaker/Extensions.cs

@@ -23,7 +23,8 @@ namespace DbMaker
 
         public static void put<TKey, TValue>(this IDictionary<TKey, TValue> dic, TKey key, TValue value)
         {
-            dic.Add(key,value);
+            //dic.Add(key,value);
+            dic[key] = value;
         }
 
         public static void add<TItem>(this IList<TItem> list, TItem item)

maker/csharp/DbMaker/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "DbMaker": {
+      "commandName": "Project",
+      "commandLineArgs": " -src ip.merge.txt -region global_region.csv"
+    }
+  }
+}

maker/csharp/DbMaker/RandomAccessFile.cs

@@ -7,7 +7,7 @@ namespace DbMaker
     {
         private readonly Stream _stream;
 
-        public RandomAccessFile(String file) : this(File.OpenRead(file))
+        public RandomAccessFile(String file) : this(File.Open(file, FileMode.OpenOrCreate))
         {
 
         }