jmftrindade / cs511-imusic / changeset / 192f7385c5ec

Up to file-list album_gracenote_tracklist.php:

@@ -102,7 +102,7 @@ if (isset($_GET['album']) && isset($_GET
            } else {
              	// if cannot found on gracenote, try to search from lastfm
-             	tracklist_lastfm_search ($album);
+             	tracklist_lastfm_search ($album,$artist);
+           }
 	} // if there's no mbid, we search on gracenote -> end

Up to file-list album_tracklist.php:

 <?php
 function tracklist_lastfm_search ($album) {
     $query = urlencode($album);
     // Huong: Get last.fm album search results, and create simplexml from it
     $lastfmhost = 'http://ws.audioscrobbler.com/2.0/';
     $apikey = '33b95aaa4235e255b823aead4871c151';
     $method = 'album.search';
     $url = $lastfmhost.'?method='.$method.'&album='.$query.'&api_key='.$apikey;
      $ch = curl_init($url);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($ch, CURLOPT_HEADER, 0);
     $data = curl_exec($ch);
   //  echo $data;
     curl_close($ch);
     $lastfm_results = new SimpleXmlElement($data, LIBXML_NOCDATA);
 function tracklist_lastfm_search ($album,$artist) {
     $album = urlencode($album);
     $artist = urlencode($artist);
     $tracklist_url = "http://www.last.fm/music/";
     $tracklist_url .= $artist.'/'.$album;
     //echo $tracklist_url;
     $raw = file_get_contents($tracklist_url);
     $newlines = array("\t","\n","\r","\x20\x20","\0","\x0B");
     $content = str_replace($newlines, "", html_entity_decode($raw));
     $album_url = "";
     $tracklist_url = "";
     foreach ($lastfm_results->results->albummatches->album as $theresult) {
         // Huong: select the url for exactly match
        if (strcasecmp($theresult->name, $album) == 0)
+            {
                // get info to search next
                $album_name = urlencode($theresult->name);
                $artist_name = urlencode($theresult->artist);
                $method = 'album.getInfo';
                $album_url = $lastfmhost.'?method='.$method.'&artist='.$artist_name.'&album='.$album_name.'&api_key='.$apikey;
                $tracklist_url = $theresult->url;
              //  echo $tracklist_url. "HAHAHHA <br>";
                break;  // take the first matched album
+            }
+  // echo $raw;
     $start_pos = strpos($content,"<tbody>");
     $end_pos = strpos($content,"</tbody");
     $result = substr($content, $start_pos, $end_pos - $start_pos);
     $result = str_replace($newlines, "",$result);
     $pos_string = "<td class=\"positionCell\">";
     $name_string = "<td class=\"subjectCell\">";
     $start_pos = 0;
     $tracklist = array();
     for ($i =1; $i <= 20; $i++){
         $tracklist[$i] = "";
+    }
     // Huong: if found 1
     if (strcmp($tracklist_url,"") != 0){
     while (strpos($result, $pos_string, $start_pos) != FALSE) {
         $start_pos = strpos($result, $pos_string, $start_pos);
         $end_pos = strpos($result, "</td>", $start_pos);
         $pos = substr($result, $start_pos + strlen($pos_string),$end_pos - $start_pos - strlen($pos_string));
         $yql_query = "select * from html where url=\"";
         $yql_query .= $tracklist_url;
         $yql_query .= "\" and xpath=\"/html/body/div[2]/div/div[4]/div[2]/div/table/tbody\"";
         $yql_query = rawurlencode($yql_query);
         $yql_query = "http://query.yahooapis.com/v1/public/yql?q=". $yql_query;
         $yql_query .= "&format=xml";
-        // echo $yql_query.'<br>';
+        $start_pos = strpos($result, $name_string, $start_pos);
         $start_pos = strpos($result,"album=\"\">",$start_pos);
         $end_pos = strpos($result, "</a>", $start_pos);
         $name = substr($result, $start_pos + 9,$end_pos - $start_pos - 9);
         $ch2 = curl_init($yql_query);
         curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch2, CURLOPT_HEADER, 0);
         $data2 = curl_exec($ch2);
         curl_close($ch2);
         $tracklist_results = new SimpleXmlElement($data2, LIBXML_NOCDATA);
         //echo $tracklist_results->asXML();
         $tracklist[(int)$pos] = $name;
         $start_pos++;
+    }
         // Huong: display result
         for ($i= 1 ; $i <= sizeof($tracklist); $i++) {
             if ($tracklist[$i] != "")
                 echo $i.': <a href="index.php?artist='.$artist.'&track='.$tracklist[$i].'"  title="Search on iMusic for '.$artist.' - '.$tracklist[$i].'"">'.$artist.' - '.$tracklist[$i].'</a><br/>';
+        }
         $tracklist = array();
         foreach ($tracklist_results->results->tbody->tr as $rows) {
             $pos = $rows->td[0]->p;
             if ($rows->td[2]->p->a != "")
                 { $name = $rows->td[2]->p->a; }
             else
                 { $name = $rows->td[2]->a; }
             if ($pos != "")
                 $tracklist[(int)$pos]= $name;
+         }
         // Huong: display result
         for ($i =1 ; $i <= sizeof($tracklist); $i++) {
                 echo $i.": ".$tracklist[$i].'<br>';
+          }
+        }
+}
 ?>

Up to file-list track_lyrics.php:

@@ -9,14 +9,14 @@ function GetTag($p,$t,$l) {
 	if($l==0) {
 		$l=1;
+	}
 	$sp=0;
 	while($l>0) {
 		$sp=strpos($p, "<".$t.">", $sp);
 		$sp=$sp+strlen($t)+2;
 		$l--;
+	}
 	if($sp-strlen($t)-2==0) {
 		$GetTag=FALSE;
 	} else {
@@ -24,7 +24,7 @@ function GetTag($p,$t,$l) {
 		$ep=$ep-$sp;
 		$GetTag=substr($p,$sp,$ep);
+	}
 	return $GetTag;
+}
@@ -36,45 +36,45 @@ function filterChar($str) {
 	return $str;
+}
 function track_lyricsfly($track, $artist){
 // Huong -> s ir our search query variable
-if(isset($_GET['track']) && isset($_GET['artist']) ) {
+ //if(isset($_GET['track']) && isset($_GET['artist']) ) {
 	$title = $_GET['track'];
 	$artist = $_GET['artist'];
 	//******** setings ***************************************************************
-	$user_ID="c67d3bc5dfd3a5e7a-temporary.API.access";	//Set your lyricsfly.com User ID key
+	$user_ID="80605b0b9a84c5e2c-temporary.API.access";	//Set your lyricsfly.com User ID key
 	//$artist="Britney Spears";							//Set the artist you want to find lyrics for
 	//$title="Baby One More Time";						//Set the title for the song you want to find lyrics to
 	$song_number=1;										//Set to 1 if you want the first result or 2 if you want 2nd result and so on...
 	//******** setings ***************************************************************
 	$artist=urlencode(filterChar($artist));		//filter and encode for url string
-	$title=urlencode(filterChar($title));
+	$title=urlencode(filterChar($title));
 	$url="http://lyricsfly.com/api/api.php?i=".$user_ID."&a=".$artist."&t=".$title;   //url construction string with pluged in from above values
 	$html=file_get_contents($url);				//retrieve the entire xml page into string
 	$found_check= GetTag($html,"sg",$song_number);
 	//check if song was found
 	if($found_check=="Not found") {
 		echo "Sorry, lyrics for this title are not available in lyricsfly database.<br>";	//... if not print a message
 		echo "Please <a href='http://lyricsfly.com/submit/'>submit</a>";					//and print link to submit form
+	}
 	//check if site ID is good
 	elseif($found_check=="Wrong site ID!") {
 		echo "Sorry, access to lyricsfly API has been terminated please contact the administrator";
+	}
 	//check if user ID access key is missing and if the number of song titles is not passed the amount which was returned
 	elseif($found_check=="Missing site ID!" or $found_check==FALSE)	{
 		echo "Sorry, the API code was not properly implemented";
+	}
 	//finally, if everything check on we retrieve and print the data returned by lyricsfly database
 	else {
-		$found_checksum=GetTag($html,"cs",$song_number);	//get song checksum
+             $found_checksum=GetTag($html,"cs",$song_number);	//get song checksum
 		$found_ID=GetTag($html,"id",$song_number);			//get song ID
 		$found_title=GetTag($html,"tt",$song_number);		//get song title
 		$found_artist=GetTag($html,"ar",$song_number);		//get song artist
@@ -87,10 +87,11 @@ if(isset($_GET['track']) && isset($_GET[
 		echo "<b>Artist: $found_artist</b><br>";	//print artist name
 		echo "<b>Album: $found_album</b><br><br>";	//print album name
 		echo "$found_lyrics";						//print lyrics
 		//create a link to correction form for users to be able to correct lyrics
 		echo "<a href='http://lyricsfly.com/search/correction.php?".$found_checksum."&id=".$found_ID."'>Fix above lyrics here</a><br><br>";
+	}
 		echo "<a href='http://lyricsfly.com/search/correction.php?".$found_checksum."&id=".$found_ID."'>To see full lyric</a><br><br>";
+          }
+}
 ?>

Up to file-list track_lyricswiki.php:

 <?php
 include "./track_lyrics.php";
 if(isset($_GET['artist']) && isset($_GET['track'])) {
 	// bug fix for when artist or track contains single quotes
 	$artist = $_GET['artist'];
@@ -22,9 +22,15 @@ if(isset($_GET['artist']) && isset($_GET
 	$dom = @DOMDocument::loadHTML($html);
 	echo "<h1>Lyrics</h1>";
 	echo '<h2>'.$artist.' - '.$track.'</h2><br/>';
 	// print only lyrics node (it's the first "<p>")
-	echo $dom->saveXML($dom->documentElement->getElementsByTagName('p')->item(0));
+        $lyric = $dom->saveXML($dom->documentElement->getElementsByTagName('p')->item(0));
         if (strpos($lyric,"http-status-message=\"Not Found\"") != FALSE) {
             track_lyricsfly($track, $artist);
         } else{
             echo '<h2>'.$artist.' - '.$track.'</h2><br/>';
             echo $lyric;
+        }
+}
 ?>

commit 29:	192f7385c5ec
parent 28:	9051f7c6aacc
branch:	default