author | llornkcor <llornkcor> | 2004-11-02 02:41:04 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-11-02 02:41:04 (UTC) |
commit | e83e5bd3f26270d61a83b8b91e07b35d2657d060 (patch) (side-by-side diff) | |
tree | eec1223a69d28cd684116976dc7e970bbf846054 /noncore/apps | |
parent | 51b7bdf260bc2b5b066c6594a6d0c507add682fd (diff) | |
download | opie-e83e5bd3f26270d61a83b8b91e07b35d2657d060.zip opie-e83e5bd3f26270d61a83b8b91e07b35d2657d060.tar.gz opie-e83e5bd3f26270d61a83b8b91e07b35d2657d060.tar.bz2 |
new mirror site web page requiring new parsing
-rw-r--r-- | noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp index de9c72b..44ade8d 100644 --- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp +++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp @@ -18,6 +18,4 @@ #include "output.h" -/* OPIE */ -#include <opie2/odebug.h> #include <qpe/config.h> @@ -44,5 +42,5 @@ void optionsDialog::ftpSiteDlg( ) dir.mkdir(ListFile,true); ListFile+="/ftpList"; - odebug << "opening "+ListFile << oendl; + qDebug( "opening "+ListFile ); if ( QFile(ListFile).exists() ) { openSiteList(); @@ -72,5 +70,6 @@ void optionsDialog::getSite() // outputFile = local_library+ "list.html"; outputFile = ListFile + "list.html"; - QString networkUrl= "http://www.gutenberg.org/www/mirror.sites.html"; + QString networkUrl="http://www.gutenberg.net/catalog/world/selectpermanentmirror?fk_books=12962"; +// QString networkUrl= "http://www.gutenberg.org/www/mirror.sites.html"; //http://www.gutenberg.org/index.html"; // QString networkUrl= "http://llornkcor.com/index.shtml"; @@ -82,5 +81,5 @@ void optionsDialog::getSite() // if( NetworkDlg->exec() != 0 ) // { // use new, improved, *INSTANT* network-dialog-file-getterer -// odebug << "gitcha!" << oendl; +// qDebug( "gitcha!" ); // } // delete NetworkDlg; @@ -89,6 +88,6 @@ void optionsDialog::getSite() // TODO qprocess here - QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl + " 2>&1" ; - odebug << "Issuing the command "+cmd << oendl; + QString cmd="wget -T 15 -O " +outputFile + " " + networkUrl;// + " 2>&1" ; + qDebug( "Issuing the command "+cmd ); Output *outDlg; outDlg = new Output( 0, tr("Downloading ftp sites...."),TRUE); @@ -119,5 +118,5 @@ bool optionsDialog::parseFtpList( QString outputFile) // parse ftplist html and extract just the machine names/directories // TODO: add locations!! - odebug << "parse ftplist "+outputFile << oendl; + qDebug( "parse ftplist "+outputFile ); QString ftpList, s_location; QFile f( outputFile ); @@ -132,45 +131,42 @@ bool optionsDialog::parseFtpList( QString outputFile) int start; int end; - if( s.find( "FTP mirror sites for Project Gutenberg:", 0, TRUE) !=-1) { //lower end of this file + if( s.find( "Select a Default Download Site - Project Gutenberg", 0, TRUE) !=-1) { //lower end of this file b_gotchTest = true; } if( b_gotchTest) { if(( start = s.find( "ftp://", 0, TRUE))!=-1 ) { - end = s.find( "/\"", 0, TRUE);// ==-1)) { +// qDebug(s); +// qDebug("%d", start); + end = s.find( "</td></tr>", 0, TRUE);// ==-1)) { if( end == -1) { end = s.find( "\">"); } +// qDebug("end %d", end); + start =start + 6; ftpSite = s.mid( start, (end - start) ); if(ftpSite.right(1) != "/") { // ftpSite += "/"; } - ftpSite=ftpSite.right( ftpSite.length()-6); - if( ftpSite.find("\n", 0, TRUE) ) - ftpSite.remove( ftpSite.find("\n", 0, TRUE), 1); +// qDebug("ftpsite " + ftpSite); - if( ftpSite.find("\"", 0, TRUE) ) - ftpSite.remove( ftpSite.find("\"", 0, TRUE), 1); - if( ftpSite.find("a>", 0, TRUE) ) - ftpSite.remove( ftpSite.find("a>", 0, TRUE) -2, 4); - - - s = t.readLine(); + for (int j = 0 ; j<3;j++) { s = t.readLine(); - if(( start=s.find("<BR>(", 0, TRUE) ) != -1) { -// odebug << "" << s << "" << oendl; - end = s.find( ")", 0, TRUE)+1; - s_location= s.mid( start+4, (end - start) ); - -// odebug << "" << s_location << "" << oendl; -// ftpList += ftpSite + "\n"; -// ftp_QListBox_1->sort( TRUE ); - ftpList += s_location+ " "+ftpSite+"\n"; + QString finder="</td><td rowspan=\"3\">"; + if(( start = s.find( finder, 0, TRUE) ) != -1) { + // qDebug( "%d" + s, start ); + end = s.find( finder, start + 2, TRUE) ; +// qDebug("end %d",end); + s_location = s.mid( start + finder.length() , (end - start)-finder.length() ); +// +// qDebug("Location "+s_location ); + ftpList += s_location+ " "+ftpSite+"\n"; ftp_QListBox_1->sort( TRUE ); QString winbug=" "; ftp_QListBox_1->insertItem ( s_location.latin1() +winbug+ftpSite); + j=3; // ftp_QListBox_1->insertItem ( ftpSite+" "+s_location.latin1()); } - + } // ftp_QListBox_1->insertItem ( ftpSite); } @@ -196,5 +192,5 @@ bool optionsDialog::parseFtpList( QString outputFile) void optionsDialog::openSiteList() { - odebug << " just opens the ftp site list" << oendl; + qDebug( " just opens the ftp site list" ); // ListFile = ( QDir::homeDirPath ()) +"/.gutenbrowser/ftpList"; QFile f( ListFile); @@ -236,5 +232,7 @@ void optionsDialog::select_site( const char *index ) // if(s_site.find("(",0,TRUE)) s_site2=s_site.right( s_site.length()-(s_site.find(" ",0,TRUE)+4) ); -odebug << "Selected ftp site is "+ s_site2 << oendl; + + qDebug( "Selected ftp site is "+ s_site2 ); + int i_ftp = s_site2.find("/", 0, FALSE); ftp_host = s_site2.left(i_ftp ); |