--- chewbacca/YodaProfiler/docs/retrieve_TLE.sh	2008/09/23 07:20:31	1.1.1.1
+++ chewbacca/YodaProfiler/docs/retrieve_TLE.sh	2013/09/02 14:50:36	1.7
@@ -7,8 +7,8 @@
 # Modified by Emiliano Mocchiutti 2006/10/17
 #
 
-USER=pam2006
-PASS=Resurs05
+#USER=pam2006
+#PASS=Resurs05
 OUTFILE=tle.txt
 FORCE="no"
 
@@ -21,10 +21,10 @@
 	    echo ""
 	    echo " Options: "
 	    echo ""
-	    echo " --user=username : spacetrack username [default pam2006] "
-	    echo ""
-	    echo " --psw=password :  spacetrack password [default Resurs150606]"
-	    echo ""
+#	    echo " --user=username : spacetrack username [default pam2006] "
+#	    echo ""
+#	    echo " --psw=password :  spacetrack password [default Resurs150606]"
+#	    echo ""
 	    echo " --output=filename : output filename [default tle.txt]"
 	    echo ""
 	    echo " --force : override existing output file [default no]"
@@ -36,16 +36,16 @@
 	    fi
 	    exit 0
 	fi
-	TEST=`echo $INPUT | sed 's/--user=//g'`
-	if [ $TEST != $INPUT  ]; then
-	    USER=`echo $TEST`
-	    export USER;
-	fi
-	TEST=`echo $INPUT | sed 's/--psw=//g'`
-	if [ $TEST != $INPUT  ]; then
-	    PASS=`echo $TEST`
-	    export PASS;
-	fi
+#	TEST=`echo $INPUT | sed 's/--user=//g'`
+#	if [ $TEST != $INPUT  ]; then
+#	    USER=`echo $TEST`
+#	    export USER;
+#	fi
+#	TEST=`echo $INPUT | sed 's/--psw=//g'`
+#	if [ $TEST != $INPUT  ]; then
+#	    PASS=`echo $TEST`
+#	    export PASS;
+#	fi
 	TEST=`echo $INPUT | sed 's/--output=//g'`
 	if [ $TEST != $INPUT  ]; then
 	    OUTFILE=`echo $TEST`
@@ -80,16 +80,30 @@
 
 echo ""
 echo " Setting cookies to connect to spacetrack "
-wget -o /dev/null -O /dev/null --save-cookies .cookies.txt \
-http://www.space-track.org/perl/login.pl --post-data="_submitted=1&username=$USER&password=$PASS"
+wget  --post-data='identity=pam2006&password=Resurs05' --cookies=on --keep-session-cookies --save-cookies=.cookies.txt 'https://www.space-track.org/ajaxauth/login' -o/dev/null
+#wget -o /dev/null -O /dev/null --no-check-certificate --save-cookies .cookies.txt \
+#"https://www.space-track.org/perl/login.pl?_submitted=1&username=$USER&password=$PASS"
 echo " Done!"
 echo ""
 
-echo " Retrieving Resurs-DK1 TLEs "
-wget -o /dev/null -O - --load-cookies .cookies.txt \
+echo " Retrieving Resurs-DK1 TLEs 2006-2009"
+wget -o /dev/null -O - --limit-rate=100K --no-check-certificate --load-cookies .cookies.txt \
 --save-cookies .cookies.txt --keep-session-cookies \
-http://www.space-track.org/perl/id_query.pl --post-data="_submitted=1&_sessionid=&ids=29228&timeframe=timespan&start_year=2006&start_month=6&start_day=14&end_year=$YEAR&end_month=$MONTH&end_day=$DAY&common_name=yes&sort=&descending=&ascii=yes&_submit=Submit&_reset=Reset" \
+"https://www.space-track.org/basicspacedata/query/class/tle/EPOCH/2006-06-14--2009-12-31/NORAD_CAT_ID/29228/orderby/TLE_LINE1 ASC/format/3le"\
+#"https://www.space-track.org/perl/id_query.pl?_submitted=1&_sessionid=&ids=29228&timeframe=timespan&start_year=2006&start_month=6&start_day=14&end_year=2009&end_month=12&end_day=31&common_name=yes&sort=&descending=&ascii=yes&_submit=Submit&_reset=Reset "\
 | egrep "1|2|R" > .tleretrieved.txt
+echo " Retrieving Resurs-DK1 TLEs 2010-2011"
+wget -o /dev/null -O - --limit-rate=100K --no-check-certificate --load-cookies .cookies.txt \
+--save-cookies .cookies.txt --keep-session-cookies \
+"https://www.space-track.org/basicspacedata/query/class/tle/EPOCH/2010-01-01--2011-12-31/NORAD_CAT_ID/29228/orderby/TLE_LINE1 ASC/format/3le"\
+#"https://www.space-track.org/perl/id_query.pl?_submitted=1&_sessionid=&ids=29228&timeframe=timespan&start_year=2010&start_month=1&start_day=1&end_year=2011&end_month=12&end_day=31&common_name=yes&sort=&descending=&ascii=yes&_submit=Submit&_reset=Reset"\
+| egrep "1|2|R" >> .tleretrieved.txt
+echo " Retrieving Resurs-DK1 TLEs >=2012"
+wget -o /dev/null -O - --limit-rate=100K --no-check-certificate --load-cookies .cookies.txt \
+--save-cookies .cookies.txt --keep-session-cookies \
+"https://www.space-track.org/basicspacedata/query/class/tle/EPOCH/2012-01-01--$YEAR-$MONTH-$DAY/NORAD_CAT_ID/29228/orderby/TLE_LINE1 ASC/format/3le"\
+#"https://www.space-track.org/perl/id_query.pl?_submitted=1&_sessionid=&ids=29228&timeframe=timespan&start_year=2012&start_month=1&start_day=1&end_year=$YEAR&end_month=$MONTH&end_day=$DAY&common_name=yes&sort=&descending=&ascii=yes&_submit=Submit&_reset=Reset "\
+| egrep "1|2|R" >> .tleretrieved.txt
 echo " Done!"
 echo ""
 
@@ -97,15 +111,19 @@
 if [[ `wc -l < .tleretrieved.txt` -le 2 ]] || [ "$CHECK" == "" ]; then # no tle
     echo "ERROR: No tle retrieved from spacetrack.org"
     echo ""
-    rm -f .cookies.txt
-    rm -f .tleretrieved.txt
+#    rm -f .cookies.txt
+#    rm -f login
+#    rm -f .tleretrieved.txt
     exit 1
 fi
 
-cp .tleretrieved.txt $OUTFILE
+#cp .tleretrieved.txt $OUTFILE
+
+cat .tleretrieved.txt | sed 's/0 RESURS DK-1/RESURS DK-1/g' | sed -e 's/\r//g' > $OUTFILE
 
 echo " File saved as $OUTFILE"
 echo ""
+rm -f login
 rm -f .cookies.txt
 rm -f .tleretrieved.txt
 exit 0