# HG changeset patch
# User victorp@symbian.org
# Date 1249046117 -3600
# Node ID 8fb98cf0b1ac5abf3ca726fb80f6f4e63dcf1219
# Parent  dbe87093a3ca1e2889eefd809b500dd5bed8aaea
remove authentication as default, added -a option for cookies

diff -r dbe87093a3ca -r 8fb98cf0b1ac tdroadmap_merger/gettd.pl
--- a/tdroadmap_merger/gettd.pl	Fri Jul 31 11:01:24 2009 +0100
+++ b/tdroadmap_merger/gettd.pl	Fri Jul 31 14:15:17 2009 +0100
@@ -6,9 +6,10 @@
 use Getopt::Long;
 
 
-my $target_url;
-my $tdomain;
-my $csvfile;
+my $target_url; #target url for the roadmap
+my $tdomain; #tag for the domain to be use in csv file
+my $csvfile; #output csv file name
+my $authon= '';	; #does it require authorisation? default is false
 
 sub getpage
 {
@@ -23,7 +24,7 @@
 	$port = "http(80)";
 	$getmess = "GET " . $page ." HTTP/1.1\n" . $auth;
 
-	print "sending message - $getmess\n";
+	print "INFO - sending message - $getmess\n";
 	print outputfile "$getmess\n\n";
 
 	$sock = IO::Socket::INET->new 	
@@ -112,7 +113,7 @@
 		$exp="\\<h2\\>.*?\\>".$_;
 		
 		if ($roadmap =~ m /($exp)/sg) { 
-			print "Found entry for $_ \n";
+			print "PASS - Found entry for $_ \n";
 			$relroad =$';	
 			
 			if ($relroad =~ m /(.*?)\<h2/sg) { $relroad =$1;}
@@ -150,9 +151,10 @@
 sub printhelp
 {
 
-	print "\n\n version 0.2 
+	print "\n\n version 0.3 
 	\ngettd.pl -t=url -d=domain \nrequired parameters:\n\t -t url containing the technology domain roadmap\n\t -d the technology domain name
-	\n Optional parameters\n\t-o filename ,the output is logged into the output.csv file by default\n\t-h for help";
+	\n Optional parameters\n\t-o filename ,the output is logged into the output.csv file by default\n\t-h for help
+	\n\t-a setup authorisation by cookie follow instructions in http://developer.symbian.org/wiki/index.php/Roadmap_merger_script#Cookies";
 	exit;
 }
 
@@ -165,7 +167,7 @@
   my $help;
 
 
-  GetOptions('h' => \$help,'t=s'=> \$target_url, 'd=s' => \$tdomain , 'o=s' => \$csvfile);
+  GetOptions('h' => \$help,'t=s'=> \$target_url, 'd=s' => \$tdomain , 'o=s' => \$csvfile, 'a' => \$authon);
 
   if ($help) {
     printhelp;
@@ -190,19 +192,24 @@
 	$csvfile="output.csv";
  }
  print "\nINFO-output recorded in $csvfile \n";
-        
+
+
+
+     
 
 
 
 }
 #main
 $/ = " ";
+cmd_options();
 
-#file containing login details from http cookie
-$mycookie = loadfile("mycookie.txt");
+if ($authon) {
+	#file containing login details from http cookie
+	$mycookie = loadfile("mycookie.txt");
 
-#$auth ="Authorization: Basic Zm91bmRhdGlvbjp0ZXN0MA==";
-$auth = "Cookie: " . $mycookie ;
+	$auth = "Cookie: " . $mycookie ;
+}
 
 #foundation releases - add as required
 @releases=("Symbian\\^2","Symbian\\^3","Symbian\\^4");
@@ -211,7 +218,7 @@
 $host1 = "developer.symbian.org";
 
 
-cmd_options();
+
 
 getpage($target_url, $host1, $auth, "debug.txt");
 td_roadmap("debug.txt" , $csvfile, $tdomain ,@releases);