@@ -4,14 +4,18 @@ var fs = require('fs');
44var request = require ( 'request' ) ;
55var codeParser = require ( '../../codeSnippitExtractor.js' ) ;
66var async = require ( 'async' ) ;
7+ var textSearch = require ( 'mongoose-text-search' ) ;
78
89
910var extractDependencies = function ( content ) {
10- return content . match ( / r e q u i r e \( \s * [ \' \" ] [ a - z ] * [ \' \" ] \s * \) / g)
11- . map ( function ( el ) {
12- var finStr = el . substring ( 8 , el . length - 1 ) . trim ( ) ;
13- return finStr . substring ( 1 , finStr . length - 1 ) ;
14- } ) ;
11+ var requireRegex = content . match ( / r e q u i r e \( \s * [ \' \" ] [ a - z ] * [ \' \" ] \s * \) / g) ;
12+ if ( ! requireRegex ) {
13+ return [ ] ;
14+ }
15+ requireRegex . map ( function ( el ) {
16+ var finStr = el . substring ( 8 , el . length - 1 ) . trim ( ) ;
17+ return finStr . substring ( 1 , finStr . length - 1 ) ;
18+ } ) ;
1519} ;
1620
1721exports . addToDB = function ( req , res , next ) {
@@ -46,20 +50,21 @@ exports.addToDB = function(req, res, next) {
4650} ;
4751
4852exports . findCode = function ( req , res , next ) {
49- var library = req . query . library . toString ( ) ;
50- var libFunction = req . query . libFunction . toString ( ) ;
53+ var library = req . query . library ;
54+ var libFunction = req . query . libFunction ;
5155
56+ var searchOptions = { filter : { dependencies : library } } ;
5257
53- File . find ( { dependencies : library } , function ( err , files ) {
54- // console.log(files);
58+ File . textSearch ( libFunction , searchOptions , function ( err , files ) {
59+ console . log ( files ) ;
5560
5661 var snippIterator = function ( doc , callback ) {
57- var docContent = doc . contents ;
62+ var docContent = doc . obj . contents ;
5863 var snippit = codeParser ( docContent , library , libFunction ) ;
5964 callback ( null , snippit ) ;
6065 } ;
6166
62- async . map ( files , snippIterator , function ( err , snippitsArr ) {
67+ async . map ( files . results , snippIterator , function ( err , snippitsArr ) {
6368 var returnArr = [ ] ;
6469
6570 snippitsArr . forEach ( function ( snippitsArr ) {
0 commit comments