[Mt-daapd-cvs] mt-daapd/src Makefile.am,1.44,1.45 dbs-sqlite.c,1.37,1.38 smart-parser.c,1.13,1.14

[Ron P. <rp...@us...>]

Update of /cvsroot/mt-daapd/mt-daapd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26983

Modified Files:
	Makefile.am dbs-sqlite.c smart-parser.c 
Log Message:
integrate smart playlist parsing into the database

Index: smart-parser.c
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/src/smart-parser.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** smart-parser.c	22 Oct 2005 23:05:29 -0000	1.13
--- smart-parser.c	23 Oct 2005 07:33:24 -0000	1.14
***************
*** 610,614 ****
      }
  
!     sp_enter_exit(tree,"sp_parse_oexptr",0,expr);
      return expr;
  }
--- 610,614 ----
      }
  
!     sp_enter_exit(tree,"sp_parse_oexpr",0,expr);
      return expr;
  }

Index: dbs-sqlite.c
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/src/dbs-sqlite.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** dbs-sqlite.c	26 Sep 2005 02:15:50 -0000	1.37
--- dbs-sqlite.c	23 Oct 2005 07:33:24 -0000	1.38
***************
*** 41,44 ****
--- 41,45 ----
  #include "restart.h"
  #include "ssc.h"
+ #include "smart-parser.h"
  
  /* Globals */
***************
*** 64,67 ****
--- 65,69 ----
  int db_sqlite_get_version(void);
[...2470 lines suppressed...]
!             r_close(to_fd);
!             
!             copied=1;
!         }
  
!         if(db_sqlite_exec(E_LOG,db_sqlite_upgrade_scripts[from_version]) != DB_E_SUCCESS) {
!             DPRINTF(E_FATAL,L_DB,"Error upgrading database.  A backup copy of "
!                     "you original database is located at %s.  Please save it "
!                     " somewhere and report to the forums at www.mt-daapd.org. "
!                     " Thanks.\n",
!                     db_new_path);
!         }
!         from_version++;
      }
  
      /* removed our backup file */
      if(copied)   
!         unlink(db_new_path);
  
      return 0;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/src/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Makefile.am	1 Jun 2005 14:40:27 -0000	1.44
--- Makefile.am	23 Oct 2005 07:33:24 -0000	1.45
***************
*** 37,41 ****
  	strsep.c dynamic-art.c dynamic-art.h query.c query.h ssc.c ssc.h \
  	db-generic.c db-generic.h dispatch.c dispatch.h \
! 	rxml.c rxml.h redblack.c redblack.h scan-mp3.c \
  	scan-xml.c scan-wma.c scan-aac.c scan-aac.h scan-wav.c scan-url.c \
  	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(FLACSRC) \
--- 37,41 ----
  	strsep.c dynamic-art.c dynamic-art.h query.c query.h ssc.c ssc.h \
  	db-generic.c db-generic.h dispatch.c dispatch.h \
! 	rxml.c rxml.h redblack.c redblack.h scan-mp3.c smart-parser.c \
  	scan-xml.c scan-wma.c scan-aac.c scan-aac.h scan-wav.c scan-url.c \
  	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(FLACSRC) \