Changeset 25440

Timestamp:

2012-04-19T16:09:40+12:00 (12 years ago)

Author:

sjm84

Message:

Adding a hashing function (replica of our cpp version)

File:

• main/trunk/greenstone3/web/interfaces/oran/js/javascript-global-functions.js (modified) (9 diffs)

main/trunk/greenstone3/web/interfaces/oran/js/javascript-global-functions.js

@@ -233 +233 @@
 function ifposDec(a, b)
 {
-    console.log("GOT " + a + " and " + b);
     var carry = 0;
     var num = 0;
     var i = 0;
     
-    if(b.length > a.length){console.log("RETURNING 0 (1)"); return 0;}
+    if(b.length > a.length){return a;}
     if(b.length == a.length)
     {
@@ -244 +243 @@
         while(i >= 0)
         {
-            if(a[i] > b[i]){console.log("BREAKING"); break;}
-            if(a[i] < b[i]){console.log("RETURNING 0 (2)"); return 0;}
+            if(a[i] > b[i]){break;}
+            if(a[i] < b[i]){return a;}
             i--;
         }
@@ -251 +250 @@
     
     i = 0;
+    var len = 0;
+    var outString = "";
     while((i < a.length) || (i < b.length))
     {
@@ -268 +269 @@
         
         a[i] = num;
+        outString += num + ","
         i++
-    }
-    console.log("NUM is " + num); 
-    
-    return 1;
+        
+        if(num != 0){len = i}
+    }
+
+    if(len < a.length)
+    {
+        a = a.slice(0, len);
+    }
+    
+    return a;
 }
 
@@ -289 +297 @@
     for(i = a.length - 1; i >= 0; i--)
     {
-        console.log("i is " + i + " a[i] is " + a[i] + " a[i]/16 is " + Math.floor(a[i]/16) + " a[i]%16 is " + Math.floor(a[i]%16));
-        console.log("Adding " + convert[Math.floor(a[i]/16)] + " and " + convert[Math.floor(a[i]%16)]);
         result.push(convert[Math.floor(a[i]/16)]);
         result.push(convert[Math.floor(a[i]%16)]);
@@ -318 +324 @@
     for(var i = 0; i < 8; i++)
     {
-        primePow.push(pow);
+        primePow.push(pow.slice()); //The javascript way to do an array copy (yuck!)
         inc(pow, pow);
     }
@@ -324 +330 @@
     for(var i = 0; i < str.length; i++)
     {
-        var c = str.charAt(i);
+        var c = str.charCodeAt(i);
 
         if(remainder.length == 99)
@@ -333 +339 @@
         for(var j = remainder.length; j > 0; j--)
         {
-            remainder[i] = remainder[i-1];
+            remainder[j] = remainder[j-1];
         }
         remainder[0] = c;
@@ -339 +345 @@
         for(var j = 7; j >= 0; j--)
         {
-            ifposDec(remainder, primePow[j]);
+            remainder = ifposDec(remainder, primePow[j]);
         }   
     }
-    
-    var returnString = remainder.length + " AWAY TO CONVERT -> ";
-    for(var i = 0; i < remainder.length; i++)
-    {
-        returnString += remainder[i] + " ";
-    }
-    console.log(returnString);
     
     return convertNum(remainder);