Changeset 224

Timestamp:

09/15/07 04:09:28 (1 year ago)

Author:

pmerrill

Message:

• Modified searchStr for movies to return better results
  
• Fixed an issue for IMDB searches. IMDB returned a /title/ page when the searchStr was a unique value.
  

Files:

• trunk/SapphireApplianceController.m (modified) (1 diff)
• trunk/SapphireMovieImporter.m (modified) (2 diffs)
• trunk/SapphireSettings.m (modified) (1 diff)

trunk/SapphireApplianceController.m

@@ -102 +102 @@
-        SapphireFileDataImporter *fileImp = [[SapphireFileDataImporter alloc] init];
-        SapphireTVShowImporter *tvImp = [[SapphireTVShowImporter alloc] initWithSavedSetting:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/tvdata.plist"]];
-
+
-        SapphireAllImporter *allImp = [[SapphireAllImporter alloc] initWithImporters:[NSArray arrayWithObjects:fileImp, tvImp, nil]];
-        [fileImp release];

trunk/SapphireMovieImporter.m

@@ -123 +123 @@
-        NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"http://www.IMDB.com%@",movieName]];
-        NSXMLDocument *document = [[NSXMLDocument alloc] initWithContentsOfURL:url options:NSXMLDocumentTidyHTML error:&error];
+
+        NSString *movieTitle= [[document objectsForXQuery:@"//div[@id='tn15title']/h1/replace(string(), '\n', '')" error:&error] objectAtIndex:0];
-        /* Dump XML document to disk (Dev Only) */
-        NSString *documentPath =[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/XML"];
-
-
+
+
+
-        
-        [ret setObject:movieTitle forKey:META_MOVIE_TITLE];
@@ -163 +166 @@
-- (NSArray *)searchResultsForMovie:(NSString *)searchStr
-{
+        /* prep the search string */
+        searchStr = [searchStr stringByDeletingPathExtension];
-        searchStr = [searchStr stringByReplacingAllOccurancesOf:@"_" withString:@" "];
-        searchStr = [searchStr stringByReplacingAllOccurancesOf:@"." withString:@" "];
-        searchStr = [searchStr stringByReplacingAllOccurancesOf:@"-" withString:@" "];
-Title?
+find?s=all&q=
-        NSError *error = nil;
-        NSXMLDocument *document = [[NSXMLDocument alloc] initWithContentsOfURL:url options:NSXMLDocumentTidyHTML error:&error];
-        /* Dump XML document to disk (Dev Only) */
-        NSString *documentPath =[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/XML"];
-
-/*Get the results list*/
+_search_result
+
-        NSXMLElement *root = [document rootElement];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                {
-
-
-
+
+
+
+
+
+
+
+
-                        
-
-
-
-
+       
+       
+       
+       
-                                        [[result objectsForXQuery:IMDB_RESULT_NAME_XPATH error:&error] objectAtIndex:0], @"name",
-                                        [resultURL path], @"link",
-                                        nil]];
+                                }
-                        }
+                        return ret;
-                }
-
+
+
+
+
+
+
+
+
+
-        }
-        /*No results found*/

trunk/SapphireSettings.m

@@ -443 +443 @@
-        else if(row == 2)
-        {
-tvd
+movieD
-                SapphireImporterDataMenu *menu = [[SapphireImporterDataMenu alloc] initWithScene:[self scene] metaDataCollection:metaCollection importer:importer];
-                [[self stack] pushController:menu];