commit 86aea8827f2f8e0a472d50c608fe5098262a29e7
author Jeff Thompson <jeff@thefirst.org> Sat Sep 29 17:32:48 2012 -0700
committer Jeff Thompson <jeff@thefirst.org> Sat Sep 29 17:32:48 2012 -0700
tree bcb57ebf2d0244d6d1a6ff3e26df39e48805c435
parent bb97609d3c2ce0e71beb051b6a9c06c574dac9b9

Major update: refactored the API of Interest and ContentObject according to the API notes:
http://sea.remap.ucla.edu:8080/attachments/download/23/lwndn_api-notes_21020830.txt

js/encoding/EncodingUtils.js

diff --git a/js/encoding/EncodingUtils.js b/js/encoding/EncodingUtils.js
index ee6af87..653bafd 100644
--- a/js/encoding/EncodingUtils.js
+++ b/js/encoding/EncodingUtils.js
@@ -2,11 +2,11 @@
 
 
 
-function encodeToHexInterest(int){
+function encodeToHexInterest(interest){
 	
 	var enc = new BinaryXMLEncoder();
  
-	int.encode(enc);
+	interest.to_ccnb(enc);
 	
 	var hex = DataUtils.toHex(enc.getReducedOstream());
 
@@ -19,7 +19,7 @@
 function encodeToHexContentObject(co){
 	var enc = new BinaryXMLEncoder();
  
-	co.encode(enc);
+	co.to_ccnb(enc);
 	
 	var hex = DataUtils.toHex(enc.getReducedOstream());
 
@@ -31,7 +31,7 @@
 function encodeToBinaryContentObject(co){
 	var enc = new BinaryXMLEncoder();
  
-	co.encode(enc);
+	co.to_ccnb(enc);
 	
 	var hex = enc.getReducedOstream();
 
@@ -43,7 +43,7 @@
 function encodeForwardingEntry(co){
 	var enc = new BinaryXMLEncoder();
  
-	co.encode(enc);
+	co.to_ccnb(enc);
 	
 	var bytes = enc.getReducedOstream();
 
@@ -63,11 +63,11 @@
 	
 	if(LOG>3)console.log('DECODING HEX FACE INSTANCE  \n'+numbers);
 
-	i = new FaceInstance();
+	var faceInstance = new FaceInstance();
 
-	i.decode(decoder);
+	faceInstance.decode(decoder);
 
-	return i;
+	return faceInstance;
 	
 }
 
@@ -78,11 +78,11 @@
 	decoder = new BinaryXMLDecoder(numbers);
 	if(LOG>3)console.log('DECODING HEX INTERST  \n'+numbers);
 
-	i = new Interest();
+	var interest = new Interest();
 
-	i.decode(decoder);
+	interest.from_ccnb(decoder);
 
-	return i;
+	return interest;
 	
 }
 
@@ -96,7 +96,7 @@
 	
 	co = new ContentObject();
 
-	co.decode(decoder);
+	co.from_ccnb(decoder);
 
 	return co;
 	
@@ -111,11 +111,11 @@
 	
 	if(LOG>3)console.log('DECODED HEX FORWARDING ENTRY \n'+numbers);
 	
-	co = new ForwardingEntry();
+	forwardingEntry = new ForwardingEntry();
 
-	co.decode(decoder);
+	forwardingEntry.decode(decoder);
 
-	return co;
+	return forwardingEntry;
 	
 }
 
@@ -130,24 +130,24 @@
     else if (co==-2)
 	output+= "CONTENT NAME IS EMPTY"
     else{
-	if(co.Name!=null && co.Name.Components!=null){
+	if(co.name!=null && co.name.Components!=null){
 	    output+= "NAME: ";
 	    
-	    for(var i=0;i<co.Name.Components.length;i++){
-		output+= "/"+ DataUtils.toString(co.Name.Components[i]);
+	    for(var i=0;i<co.name.Components.length;i++){
+		output+= "/"+ DataUtils.toString(co.name.Components[i]);
 	    }
 	    output+= "<br />";
 	    output+= "<br />";
 	}
 	
-	if(co.Content !=null){
-	    output += "CONTENT(ASCII): "+ DataUtils.toString(co.Content);
+	if(co.content !=null){
+	    output += "CONTENT(ASCII): "+ DataUtils.toString(co.content);
 	    
 	    output+= "<br />";
 	    output+= "<br />";
 	}
-	if(co.Content !=null){
-	    output += "CONTENT(hex): "+ DataUtils.toHex(co.Content);
+	if(co.content !=null){
+	    output += "CONTENT(hex): "+ DataUtils.toHex(co.content);
 	    
 	    output+= "<br />";
 	    output+= "<br />";