Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
naomiaro 2010-09-28 17:26:09 -04:00
parent f01e780831 f0c313f1dd
commit 48d68cb203
20 changed files with 529 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bin/upgrade-1.3-to-1.4.sql
View File

@ -51,6 +51,67 @@ ALTER TABLE cc_files
ADD COLUMN channels integer; ADD COLUMN channels integer;
ALTER TABLE cc_files ALTER TABLE cc_files
ADD COLUMN url character varying(1024); ADD COLUMN url character varying(1024);
ALTER TABLE cc_files
ADD COLUMN bpm character varying(8);
ALTER TABLE cc_files
ADD COLUMN rating character varying(8);
ALTER TABLE cc_files
ADD COLUMN encoded_by character varying(255);
ALTER TABLE cc_files
ADD COLUMN disc_number character varying(8);
ALTER TABLE cc_files
ADD COLUMN mood character varying(64);
ALTER TABLE cc_files
ADD COLUMN label character varying(512);
ALTER TABLE cc_files
ADD COLUMN composer character varying(512);
ALTER TABLE cc_files
ADD COLUMN encoder character varying(64);
ALTER TABLE cc_files
ADD COLUMN checksum character varying(256);
ALTER TABLE cc_files
ADD COLUMN lyrics text;
ALTER TABLE cc_files
ADD COLUMN orchestra character varying(512);
ALTER TABLE cc_files
ADD COLUMN conductor character varying(512);
ALTER TABLE cc_files
ADD COLUMN lyricist character varying(512);
ALTER TABLE cc_files
ADD COLUMN original_lyricist character varying(512);
ALTER TABLE cc_files
ADD COLUMN radio_station_name character varying(512);
ALTER TABLE cc_files
ADD COLUMN info_url character varying(512);
ALTER TABLE cc_files
ADD COLUMN artist_url character varying(512);
ALTER TABLE cc_files
ADD COLUMN audio_source_url character varying(512);
ALTER TABLE cc_files
ADD COLUMN radio_station_url character varying(512);
ALTER TABLE cc_files
ADD COLUMN buy_this_url character varying(512);
ALTER TABLE cc_files
ADD COLUMN isrc_number character varying(512);
ALTER TABLE cc_files
ADD COLUMN catalog_number character varying(512);
ALTER TABLE cc_files
ADD COLUMN original_artist character varying(512);
ALTER TABLE cc_files
ADD COLUMN copyright character varying(512);
ALTER TABLE cc_files
ADD COLUMN report_datetime character varying(32);
ALTER TABLE cc_files
ADD COLUMN report_location character varying(512);
ALTER TABLE cc_files
ADD COLUMN report_organization character varying(512);
ALTER TABLE cc_files
ADD COLUMN subject character varying(512);
ALTER TABLE cc_files
ADD COLUMN contributor character varying(512);
ALTER TABLE cc_files
ADD COLUMN language character varying(512);
ALTER TABLE cc_schedule RENAME playlist TO playlist_id; ALTER TABLE cc_schedule RENAME playlist TO playlist_id;
ALTER TABLE cc_schedule ALTER playlist_id TYPE integer; ALTER TABLE cc_schedule ALTER playlist_id TYPE integer;

88
bin/user_setup.sh
View File

@ -251,49 +251,49 @@ cat $modules_dir/storageServer/var/conf_only.php.template \
| sed -e "$replace_sed_string" \ | sed -e "$replace_sed_string" \
> $configdir/storageServer.conf.php > $configdir/storageServer.conf.php
cat $modules_dir/authentication/etc/webAuthentication.xml.template \ #cat $modules_dir/authentication/etc/webAuthentication.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/webAuthentication.xml # > $configdir/webAuthentication.xml
#
cat $modules_dir/db/etc/connectionManagerFactory.xml.template \ #cat $modules_dir/db/etc/connectionManagerFactory.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/connectionManagerFactory.xml # > $configdir/connectionManagerFactory.xml
#
cat $modules_dir/db/etc/simpleConnectionManager.xml.template \ #cat $modules_dir/db/etc/simpleConnectionManager.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/simpleConnectionManager.xml # > $configdir/simpleConnectionManager.xml
#
cat $modules_dir/schedulerClient/etc/schedulerClientFactory.xml.template \ #cat $modules_dir/schedulerClient/etc/schedulerClientFactory.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/schedulerClientFactory.xml # > $configdir/schedulerClientFactory.xml
#
cat $modules_dir/schedulerClient/etc/schedulerDaemonXmlRpcClient.xml.template \ #cat $modules_dir/schedulerClient/etc/schedulerDaemonXmlRpcClient.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/schedulerDaemonXmlRpcClient.xml # > $configdir/schedulerDaemonXmlRpcClient.xml
#
cat $modules_dir/storageClient/etc/webAuthenticationClient.xml.template \ #cat $modules_dir/storageClient/etc/webAuthenticationClient.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/webAuthenticationClient.xml # > $configdir/webAuthenticationClient.xml
#
cat $modules_dir/storageClient/etc/webStorage.xml.template \ #cat $modules_dir/storageClient/etc/webStorage.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/webStorage.xml # > $configdir/webStorage.xml
#
cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \ #cat $products_dir/scheduler/etc/campcaster-scheduler.xml.template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/campcaster-scheduler.xml # > $configdir/campcaster-scheduler.xml
#
cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \ #cat $products_dir/gLiveSupport/etc/campcaster-studio.xml.user-template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/campcaster-studio.xml # > $configdir/campcaster-studio.xml
#
cat $products_dir/gLiveSupport/etc/authenticationClient.xml.user-template \ #cat $products_dir/gLiveSupport/etc/authenticationClient.xml.user-template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/authenticationClient.xml # > $configdir/authenticationClient.xml
#
cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \ #cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \
| sed -e "$replace_sed_string" \ # | sed -e "$replace_sed_string" \
> $configdir/storageClient.xml # > $configdir/storageClient.xml
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -302,9 +302,7 @@ cat $products_dir/gLiveSupport/etc/storageClient.xml.user-template \
echo "Creating public HTML directory and links to web interfaces..." echo "Creating public HTML directory and links to web interfaces..."
mkdir -p $htmldir mkdir -p $htmldir
rm -f $htmldir/campcaster rm -f $htmldir/campcaster
ln -s $modules_dir $htmldir/campcaster ln -s $modules_dir $htmldir/campcaster

3
debian/campcaster-data.lintian-overrides vendored
View File

@ -1,12 +1,9 @@
# Upstream uses realtive paths to data folders, so we use # Upstream uses realtive paths to data folders, so we use
# syminks to /var/campcaster/.. where persistant data is stored # syminks to /var/campcaster/.. where persistant data is stored
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/stor/buffer/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/trans/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/htmlUI/var/templates_c/ campcaster-data: package-contains-empty-directory usr/share/campcaster/www/htmlUI/var/templates_c/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/access/ campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/access/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/stor/buffer/ campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/stor/buffer/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/trans/ campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/trans/
campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/access/
# Upstream uses a patched/customized version of Smarty - but is # Upstream uses a patched/customized version of Smarty - but is
# working on getting solving issue to move to a maintained one. # working on getting solving issue to move to a maintained one.
campcaster-data: embedded-php-library usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php campcaster-data: embedded-php-library usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php

2
debian/campcaster-data.prerm vendored
View File

@ -28,8 +28,6 @@ case "$1" in
# remove generated files # remove generated files
rm -rf $vardir/htmlUI/var/html/img/* rm -rf $vardir/htmlUI/var/html/img/*
rm -rf $vardir/htmlUI/var/templates_c/* rm -rf $vardir/htmlUI/var/templates_c/*
rm -rf $vardir/archiveServer/var/access/*
rm -rf $vardir/archiveServer/var/trans/*
rm -rf $vardir/storageServer/var/access/* rm -rf $vardir/storageServer/var/access/*
rm -rf $vardir/storageServer/var/trans/* rm -rf $vardir/storageServer/var/trans/*

5
debian/rules vendored
View File

@ -76,13 +76,10 @@ override_dh_install:
debian/tmp/etc/apache/90_php_campcaster.conf \ debian/tmp/etc/apache/90_php_campcaster.conf \
debian/campcaster-station/usr/share/campcaster/etc/ debian/campcaster-station/usr/share/campcaster/etc/
# CONFIG files # CONFIG files
mkdir -p debian/campcaster-station/etc/campcaster/archiveServer
mkdir -p debian/campcaster-station/etc/campcaster/storageServer mkdir -p debian/campcaster-station/etc/campcaster/storageServer
mkdir -p debian/campcaster-station/etc/campcaster/storageAdmin mkdir -p debian/campcaster-station/etc/campcaster/storageAdmin
mkdir -p debian/campcaster-station/etc/campcaster/htmlUI mkdir -p debian/campcaster-station/etc/campcaster/htmlUI
# #
mv -f debian/tmp/var/Campcaster/archiveServer/var/conf.php \
debian/campcaster-station/etc/campcaster/archiveServer/conf.php
mv -f debian/tmp/var/Campcaster/storageServer/var/conf.php \ mv -f debian/tmp/var/Campcaster/storageServer/var/conf.php \
debian/campcaster-station/etc/campcaster/storageServer/conf.php debian/campcaster-station/etc/campcaster/storageServer/conf.php
mv -f debian/tmp/var/Campcaster/storageServer/var/campcaster_version.php \ mv -f debian/tmp/var/Campcaster/storageServer/var/campcaster_version.php \
@ -93,7 +90,6 @@ override_dh_install:
debian/campcaster-station/etc/campcaster/htmlUI/ui_conf.php debian/campcaster-station/etc/campcaster/htmlUI/ui_conf.php
# #
mv -f debian/tmp/var/Campcaster/alib \ mv -f debian/tmp/var/Campcaster/alib \
debian/tmp/var/Campcaster/archiveServer \
debian/tmp/var/Campcaster/getid3 \ debian/tmp/var/Campcaster/getid3 \
debian/tmp/var/Campcaster/htmlUI \ debian/tmp/var/Campcaster/htmlUI \
debian/tmp/var/Campcaster/index.php \ debian/tmp/var/Campcaster/index.php \
@ -102,7 +98,6 @@ override_dh_install:
debian/tmp/var/Campcaster/storageAdmin \ debian/tmp/var/Campcaster/storageAdmin \
debian/campcaster-station/usr/share/campcaster/www debian/campcaster-station/usr/share/campcaster/www
# symlink CONFIG files # symlink CONFIG files
ln -s /etc/campcaster/archiveServer/conf.php debian/campcaster-station/usr/share/campcaster/www/archiveServer/var/conf.php
ln -s /etc/campcaster/storageServer/conf.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/conf.php ln -s /etc/campcaster/storageServer/conf.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/conf.php
ln -s /etc/campcaster/storageServer/campcaster_version.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/ ln -s /etc/campcaster/storageServer/campcaster_version.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/
ln -s /etc/campcaster/storageAdmin/conf.php debian/campcaster-station/usr/share/campcaster/www/storageAdmin/var/conf.php ln -s /etc/campcaster/storageAdmin/conf.php debian/campcaster-station/usr/share/campcaster/www/storageAdmin/var/conf.php

414
etc/Makefile.in
View File

@ -75,66 +75,66 @@ STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@"
STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@"
export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH} #export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH:=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH} #export PKG_CONFIG_PATH:=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
DEBUG = @DEBUG@ DEBUG = @DEBUG@
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config #DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config #XMLRPC-DOXYGEN_CONFIG = ${ETC_DIR}/xmlrpc-doxygen.config
#
XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++ #XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++
EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \ #EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \
${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod.html \ # ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod.html \
${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod-members.html # ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod-members.html
TAGFILE = ${DOXYGEN_DIR}/xmlrpc++.tag #TAGFILE = ${DOXYGEN_DIR}/xmlrpc++.tag
#
TESTRESULTS_XSLT = ${ETC_DIR}/testResultsToHtml.xsl #TESTRESULTS_XSLT = ${ETC_DIR}/testResultsToHtml.xsl
TESTRESULTS_IN = ${ETC_DIR}/testResults.xml #TESTRESULTS_IN = ${ETC_DIR}/testResults.xml
TESTRESULTS_FILE = ${DOC_DIR}/testResults.html #TESTRESULTS_FILE = ${DOC_DIR}/testResults.html
#
FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html #FLAWFINDER_FILE = ${DOC_DIR}/flawfinderReport.html
#
TOOLS_DIR = ${SRC_DIR}/tools TOOLS_DIR = ${SRC_DIR}/tools
LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++ #LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
LIBODBCXX_VERSION = libodbc++-0.2.5 #LIBODBCXX_VERSION = libodbc++-0.2.5
XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++ #XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
XMLRPCXX_VERSION = xmlrpc++-20040713 #XMLRPCXX_VERSION = xmlrpc++-20040713
TAGLIB_DIR = ${TOOLS_DIR}/taglib #TAGLIB_DIR = ${TOOLS_DIR}/taglib
TAGLIB_VERSION = taglib-1.5 #TAGLIB_VERSION = taglib-1.5
PEAR_DIR = ${TOOLS_DIR}/pear PEAR_DIR = ${TOOLS_DIR}/pear
MODULES_DIR = ${SRC_DIR}/modules MODULES_DIR = ${SRC_DIR}/modules
CORE_DIR = ${MODULES_DIR}/core #CORE_DIR = ${MODULES_DIR}/core
AUTHENTICATION_DIR = ${MODULES_DIR}/authentication #AUTHENTICATION_DIR = ${MODULES_DIR}/authentication
DB_DIR = ${MODULES_DIR}/db #DB_DIR = ${MODULES_DIR}/db
STORAGE_CLIENT_DIR = ${MODULES_DIR}/storageClient #STORAGE_CLIENT_DIR = ${MODULES_DIR}/storageClient
PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor #PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor
EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler #EVENT_SCHEDULER_DIR = ${MODULES_DIR}/eventScheduler
SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient #SCHEDULER_CLIENT_DIR = ${MODULES_DIR}/schedulerClient
WIDGETS_DIR = ${MODULES_DIR}/widgets #WIDGETS_DIR = ${MODULES_DIR}/widgets
ALIB_DIR = ${MODULES_DIR}/alib #ALIB_DIR = ${MODULES_DIR}/alib
GETID3_DIR = ${MODULES_DIR}/getid3 GETID3_DIR = ${MODULES_DIR}/getid3
HTML_UI_DIR = ${MODULES_DIR}/htmlUI HTML_UI_DIR = ${MODULES_DIR}/htmlUI
STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin STORAGE_ADMIN_DIR = ${MODULES_DIR}/storageAdmin
STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
PRODUCTS_DIR = ${SRC_DIR}/products #PRODUCTS_DIR = ${SRC_DIR}/products
SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler #SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler
GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport #GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport
SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler #SCHEDULER_EXE = ${SCHEDULER_DIR}/tmp/campcaster-scheduler
GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio #GLIVESUPPORT_EXE = ${GLIVESUPPORT_DIR}/tmp/campcaster-studio
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Targets # Targets
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
.PHONY: all doc clean docclean depclean distclean doxygen testresults .PHONY: all clean depclean distclean
.PHONY: setup tools_setup doxytag_setup modules_setup products_setup .PHONY: setup tools_setup modules_setup
.PHONY: start stop status run .PHONY: start stop status
all: setup compile all: setup
help: help:
${ECHO} "Campcaster project main Makefile" ${ECHO} "Campcaster project main Makefile"
@ -144,83 +144,83 @@ help:
${ECHO} "Useful targets for this makefile:" ${ECHO} "Useful targets for this makefile:"
${ECHO} " all - set up and compile everthing" ${ECHO} " all - set up and compile everthing"
${ECHO} " install - install everything" ${ECHO} " install - install everything"
${ECHO} " doc - build autogenerated documentation" # ${ECHO} " doc - build autogenerated documentation"
${ECHO} " clean - clean all modules" ${ECHO} " clean - clean all modules"
${ECHO} " check - check all modules" ${ECHO} " check - check all modules"
${ECHO} "" ${ECHO} ""
${ECHO} "Some less frequently used targets:" ${ECHO} "Some less frequently used targets:"
${ECHO} " setup - set up the development environment" ${ECHO} " setup - set up the development environment"
${ECHO} " doxygen - build autogenerated doxygen documentation only" # ${ECHO} " doxygen - build autogenerated doxygen documentation only"
${ECHO} " compile - compile all modules" # ${ECHO} " compile - compile all modules"
${ECHO} " recompile - recompile all modules" # ${ECHO} " recompile - recompile all modules"
doc: doxygen testresults flawfinder #doc: doxygen testresults flawfinder
#
doxygen: #doxygen:
${DOXYGEN} ${DOXYGEN_CONFIG} # ${DOXYGEN} ${DOXYGEN_CONFIG}
${DOXYGEN} ${XMLRPC-DOXYGEN_CONFIG} # ${DOXYGEN} ${XMLRPC-DOXYGEN_CONFIG}
#
testresults: #testresults:
${XSLTPROC} ${TESTRESULT_XSLT} ${TESTRESULTS_IN} > ${TESTRESULTS_FILE} # ${XSLTPROC} ${TESTRESULT_XSLT} ${TESTRESULTS_IN} > ${TESTRESULTS_FILE}
#
flawfinder: #flawfinder:
${FLAWFINDER} -c --immediate --html \ # ${FLAWFINDER} -c --immediate --html \
${CORE_DIR}/include ${CORE_DIR}/src \ # ${CORE_DIR}/include ${CORE_DIR}/src \
${AUTHENTICATION_DIR}/include ${AUTHENTICATION_DIR}/src \ # ${AUTHENTICATION_DIR}/include ${AUTHENTICATION_DIR}/src \
${DB_DIR}/include ${DB_DIR}/src \ # ${DB_DIR}/include ${DB_DIR}/src \
${STORAGE_CLIENT_DIR}/include ${STORAGE_CLIENT_DIR}/src \ # ${STORAGE_CLIENT_DIR}/include ${STORAGE_CLIENT_DIR}/src \
${PLAYLIST_EXECUTOR_DIR}/include \ # ${PLAYLIST_EXECUTOR_DIR}/include \
${PLAYLIST_EXECUTOR_DIR}/src \ # ${PLAYLIST_EXECUTOR_DIR}/src \
${EVENT_SCHEDULER_DIR}/include ${EVENT_SCHEDULER_DIR}/src \ # ${EVENT_SCHEDULER_DIR}/include ${EVENT_SCHEDULER_DIR}/src \
${SCHEDULER_CLIENT_DIR}/include ${SCHEDULER_CLIENT_DIR}/src \ # ${SCHEDULER_CLIENT_DIR}/include ${SCHEDULER_CLIENT_DIR}/src \
${WIDGETS_DIR}/include ${WIDGETS_DIR}/src \ # ${WIDGETS_DIR}/include ${WIDGETS_DIR}/src \
${SCHEDULER_DIR}/src > ${FLAWFINDER_FILE} \ # ${SCHEDULER_DIR}/src > ${FLAWFINDER_FILE} \
${GLIVESUPPORT_DIR}/src > ${FLAWFINDER_FILE} \ # ${GLIVESUPPORT_DIR}/src > ${FLAWFINDER_FILE} \
clean: clean:
${RMDIR} ${DOXYGEN_DIR}/html # ${RMDIR} ${DOXYGEN_DIR}/html
${RMDIR} ${COVERAGE_DIR}/* # ${RMDIR} ${COVERAGE_DIR}/*
${RM} ${TMP_DIR}/*.stamp # ${RM} ${TMP_DIR}/*.stamp
${RM} ${TMP_DIR}/ac* ${TMP_DIR}/config* ${TMP_DIR}/install-sh # ${RM} ${TMP_DIR}/ac* ${TMP_DIR}/config* ${TMP_DIR}/install-sh
${RMDIR} ${TMP_DIR}/auto* # ${RMDIR} ${TMP_DIR}/auto*
#
setup: ${TMP_DIR}/setup.stamp setup: ${TMP_DIR}/setup.stamp
${TMP_DIR}/setup.stamp: tools_setup doxytag_setup modules_setup products_setup ${TMP_DIR}/setup.stamp: tools_setup modules_setup
touch ${TMP_DIR}/setup.stamp touch ${TMP_DIR}/setup.stamp
recompile: modprod_distclean modules_setup products_setup compile recompile: modprod_distclean modules_setup products_setup
tools_setup: ${TMP_DIR}/tools_setup.stamp tools_setup: ${TMP_DIR}/tools_setup.stamp
${TMP_DIR}/tools_setup.stamp: ${TMP_DIR}/tools_setup.stamp:
cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && ./configure --prefix=${prefix} # cd ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install # ${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} install
#
cd ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} && ./configure --prefix=${prefix} # cd ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} install # ${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} install
#
cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix} # cd ${TAGLIB_DIR}/${TAGLIB_VERSION} && ./configure --prefix=${prefix}
${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install # ${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} install
#
cd ${PEAR_DIR} && ./configure --prefix=${prefix} cd ${PEAR_DIR} && ./configure --prefix=${prefix}
${MAKE} -C ${PEAR_DIR} install ${MAKE} -C ${PEAR_DIR} install
touch ${TMP_DIR}/tools_setup.stamp touch ${TMP_DIR}/tools_setup.stamp
tools_distclean: tools_distclean:
-${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean # -${MAKE} -C ${LIBODBCXX_DIR}/${LIBODBCXX_VERSION} distclean
-${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean # -${MAKE} -C ${XMLRPCXX_DIR}/${XMLRPCXX_VERSION} distclean
-${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean # -${MAKE} -C ${TAGLIB_DIR}/${TAGLIB_VERSION} distclean
${RM} ${TMP_DIR}/tools_setup.stamp ${RM} ${TMP_DIR}/tools_setup.stamp
doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp #doxytag_setup: ${TMP_DIR}/doxytag_setup.stamp
${TMP_DIR}/doxytag_setup.stamp: #${TMP_DIR}/doxytag_setup.stamp:
${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES} # ${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES}
touch ${TMP_DIR}/doxytag_setup.stamp # touch ${TMP_DIR}/doxytag_setup.stamp
modules_setup: ${TMP_DIR}/modules_setup.stamp modules_setup: ${TMP_DIR}/modules_setup.stamp
${TMP_DIR}/modules_setup.stamp: ${TMP_DIR}/modules_setup.stamp:
cd ${ALIB_DIR} && ./configure --prefix=${prefix} \ # cd ${ALIB_DIR} && ./configure --prefix=${prefix} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${GETID3_DIR} && ./configure --prefix=${prefix} \ cd ${GETID3_DIR} && ./configure --prefix=${prefix} \
PACKAGE_VERSION=${PACKAGE_VERSION} PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \ cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \
@ -246,115 +246,115 @@ ${TMP_DIR}/modules_setup.stamp:
--with-database-password=${DB_PASSWORD} \ --with-database-password=${DB_PASSWORD} \
--with-init-database=${INIT_LS_DATABASE} \ --with-init-database=${INIT_LS_DATABASE} \
PACKAGE_VERSION=${PACKAGE_VERSION} PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${CORE_DIR} && \ # cd ${CORE_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${AUTHENTICATION_DIR} && \ # cd ${AUTHENTICATION_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${DB_DIR} && \ # cd ${DB_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${STORAGE_CLIENT_DIR} && \ # cd ${STORAGE_CLIENT_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${PLAYLIST_EXECUTOR_DIR} && \ # cd ${PLAYLIST_EXECUTOR_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${EVENT_SCHEDULER_DIR} && \ # cd ${EVENT_SCHEDULER_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${SCHEDULER_CLIENT_DIR} && \ # cd ${SCHEDULER_CLIENT_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${WIDGETS_DIR} && \ # cd ${WIDGETS_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} \ # ./configure --prefix=${prefix} --enable-debug=${DEBUG} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
touch ${TMP_DIR}/modules_setup.stamp touch ${TMP_DIR}/modules_setup.stamp
products_setup: ${TMP_DIR}/products_setup.stamp #products_setup: ${TMP_DIR}/products_setup.stamp
${TMP_DIR}/products_setup.stamp: #${TMP_DIR}/products_setup.stamp:
cd ${SCHEDULER_DIR} && \ # cd ${SCHEDULER_DIR} && \
./configure --prefix=${prefix} \ # ./configure --prefix=${prefix} \
--enable-debug=${DEBUG} \ # --enable-debug=${DEBUG} \
--with-hostname=${HOSTNAME} \ # --with-hostname=${HOSTNAME} \
--with-www-port=${WWW_PORT} \ # --with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \ # --with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \ # --with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \ # --with-database=${DATABASE} \
--with-database-user=${DB_USER} \ # --with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \ # --with-database-password=${DB_PASSWORD} \
--with-audio-out=${STATION_AUDIO_OUT} \ # --with-audio-out=${STATION_AUDIO_OUT} \
--with-create-odbc-data-source=${CREATE_ODBC_DATA_SOURCE} \ # --with-create-odbc-data-source=${CREATE_ODBC_DATA_SOURCE} \
--with-init-database=${INIT_LS_DATABASE} \ # --with-init-database=${INIT_LS_DATABASE} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
cd ${GLIVESUPPORT_DIR} && \ # cd ${GLIVESUPPORT_DIR} && \
./configure --prefix=${prefix} \ # ./configure --prefix=${prefix} \
--enable-debug=${DEBUG} \ # --enable-debug=${DEBUG} \
--with-hostname=${HOSTNAME} \ # --with-hostname=${HOSTNAME} \
--with-www-port=${WWW_PORT} \ # --with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \ # --with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \ # --with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \ # --with-database=${DATABASE} \
--with-database-user=${DB_USER} \ # --with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \ # --with-database-password=${DB_PASSWORD} \
--with-audio-out=${STUDIO_AUDIO_OUT} \ # --with-audio-out=${STUDIO_AUDIO_OUT} \
--with-audio-cue=${STUDIO_AUDIO_CUE} \ # --with-audio-cue=${STUDIO_AUDIO_CUE} \
PACKAGE_VERSION=${PACKAGE_VERSION} # PACKAGE_VERSION=${PACKAGE_VERSION}
touch ${TMP_DIR}/products_setup.stamp # touch ${TMP_DIR}/products_setup.stamp
distclean: clean tools_distclean modprod_distclean distclean: clean tools_distclean modprod_distclean
modprod_distclean: modprod_distclean:
${MAKE} -C ${CORE_DIR} distclean # ${MAKE} -C ${CORE_DIR} distclean
${MAKE} -C ${AUTHENTICATION_DIR} distclean # ${MAKE} -C ${AUTHENTICATION_DIR} distclean
${MAKE} -C ${DB_DIR} distclean # ${MAKE} -C ${DB_DIR} distclean
${MAKE} -C ${STORAGE_CLIENT_DIR} distclean # ${MAKE} -C ${STORAGE_CLIENT_DIR} distclean
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} distclean # ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} distclean
${MAKE} -C ${EVENT_SCHEDULER_DIR} distclean # ${MAKE} -C ${EVENT_SCHEDULER_DIR} distclean
${MAKE} -C ${SCHEDULER_CLIENT_DIR} distclean # ${MAKE} -C ${SCHEDULER_CLIENT_DIR} distclean
${MAKE} -C ${WIDGETS_DIR} distclean # ${MAKE} -C ${WIDGETS_DIR} distclean
${MAKE} -C ${SCHEDULER_DIR} distclean # ${MAKE} -C ${SCHEDULER_DIR} distclean
${MAKE} -C ${GLIVESUPPORT_DIR} distclean # ${MAKE} -C ${GLIVESUPPORT_DIR} distclean
${RM} ${TMP_DIR}/compile.stamp # ${RM} ${TMP_DIR}/compile.stamp
${RM} ${TMP_DIR}/modules_setup.stamp ${RM} ${TMP_DIR}/modules_setup.stamp
${RM} ${TMP_DIR}/products_setup.stamp # ${RM} ${TMP_DIR}/products_setup.stamp
depclean: depclean:
${MAKE} -C ${CORE_DIR} depclean # ${MAKE} -C ${CORE_DIR} depclean
${MAKE} -C ${AUTHENTICATION_DIR} depclean # ${MAKE} -C ${AUTHENTICATION_DIR} depclean
${MAKE} -C ${DB_DIR} depclean # ${MAKE} -C ${DB_DIR} depclean
${MAKE} -C ${STORAGE_CLIENT_DIR} depclean # ${MAKE} -C ${STORAGE_CLIENT_DIR} depclean
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} depclean # ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} depclean
${MAKE} -C ${EVENT_SCHEDULER_DIR} depclean # ${MAKE} -C ${EVENT_SCHEDULER_DIR} depclean
${MAKE} -C ${SCHEDULER_CLIENT_DIR} depclean # ${MAKE} -C ${SCHEDULER_CLIENT_DIR} depclean
${MAKE} -C ${WIDGETS_DIR} depclean # ${MAKE} -C ${WIDGETS_DIR} depclean
${MAKE} -C ${SCHEDULER_DIR} depclean # ${MAKE} -C ${SCHEDULER_DIR} depclean
${MAKE} -C ${GLIVESUPPORT_DIR} depclean # ${MAKE} -C ${GLIVESUPPORT_DIR} depclean
-${MAKE} -C ${STORAGE_SERVER_DIR} depclean -${MAKE} -C ${STORAGE_SERVER_DIR} depclean
compile: ${TMP_DIR}/compile.stamp #compile: ${TMP_DIR}/compile.stamp
${TMP_DIR}/compile.stamp: #${TMP_DIR}/compile.stamp:
${MAKE} -C ${CORE_DIR} all # ${MAKE} -C ${CORE_DIR} all
${MAKE} -C ${AUTHENTICATION_DIR} all # ${MAKE} -C ${AUTHENTICATION_DIR} all
${MAKE} -C ${DB_DIR} all # ${MAKE} -C ${DB_DIR} all
${MAKE} -C ${STORAGE_CLIENT_DIR} all # ${MAKE} -C ${STORAGE_CLIENT_DIR} all
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} all # ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} all
${MAKE} -C ${EVENT_SCHEDULER_DIR} all # ${MAKE} -C ${EVENT_SCHEDULER_DIR} all
${MAKE} -C ${SCHEDULER_CLIENT_DIR} all # ${MAKE} -C ${SCHEDULER_CLIENT_DIR} all
${MAKE} -C ${WIDGETS_DIR} all # ${MAKE} -C ${WIDGETS_DIR} all
${MAKE} -C ${SCHEDULER_DIR} all # ${MAKE} -C ${SCHEDULER_DIR} all
${MAKE} -C ${GLIVESUPPORT_DIR} all # ${MAKE} -C ${GLIVESUPPORT_DIR} all
touch ${TMP_DIR}/compile.stamp # touch ${TMP_DIR}/compile.stamp
check: #check:
-${MAKE} -C ${CORE_DIR} check # -${MAKE} -C ${CORE_DIR} check
-${MAKE} -C ${AUTHENTICATION_DIR} check # -${MAKE} -C ${AUTHENTICATION_DIR} check
-${MAKE} -C ${DB_DIR} check # -${MAKE} -C ${DB_DIR} check
-${MAKE} -C ${STORAGE_CLIENT_DIR} check # -${MAKE} -C ${STORAGE_CLIENT_DIR} check
# -${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check # hangs on edge.campware.org # -${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} check # hangs on edge.campware.org
-${MAKE} -C ${EVENT_SCHEDULER_DIR} check # -${MAKE} -C ${EVENT_SCHEDULER_DIR} check
-${MAKE} -C ${SCHEDULER_CLIENT_DIR} check # -${MAKE} -C ${SCHEDULER_CLIENT_DIR} check
# -${MAKE} -C ${WIDGETS_DIR} check # no tests defined # -${MAKE} -C ${WIDGETS_DIR} check # no tests defined
# -${MAKE} -C ${SCHEDULER_DIR} check # has database issues # -${MAKE} -C ${SCHEDULER_DIR} check # has database issues
# -${MAKE} -C ${GLIVESUPPORT_DIR} check # has database issues # -${MAKE} -C ${GLIVESUPPORT_DIR} check # has database issues
@ -370,22 +370,22 @@ stop: ${SCHEDULER_EXE}
status: ${SCHEDULER_EXE} status: ${SCHEDULER_EXE}
${MAKE} -C ${SCHEDULER_DIR} status ${MAKE} -C ${SCHEDULER_DIR} status
run: ${GLIVESUPPORT_EXE} #run: ${GLIVESUPPORT_EXE}
${MAKE} -C ${GLIVESUPPORT_DIR} run # ${MAKE} -C ${GLIVESUPPORT_DIR} run
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Installation related targets # Installation related targets
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
.PHONY: install create_database setup_install_dirs .PHONY: install create_database setup_install_dirs
.PHONY: install_modules install_products .PHONY: install_modules
install: setup compile setup_install_dirs create_database install_modules install_products install: setup setup_install_dirs create_database install_modules
${MKDIR} ${USR_ETC_DIR}/apache ${MKDIR} ${USR_ETC_DIR}/apache
${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache ${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
${MKDIR} ${USR_BIN_DIR} ${MKDIR} ${USR_BIN_DIR}
${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR} ${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR} # ${CP} ${ETC_DIR}/campcaster-scheduler ${USR_ETC_DIR}
${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR} ${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
create_database: create_database:
@ -398,28 +398,28 @@ endif
setup_install_dirs: setup_install_dirs:
${MKDIR} ${USR_BIN_DIR} ${MKDIR} ${USR_BIN_DIR}
${MKDIR} ${USR_DOC_DIR} # ${MKDIR} ${USR_DOC_DIR}
${MKDIR} ${USR_ETC_DIR} ${MKDIR} ${USR_ETC_DIR}
${MKDIR} ${USR_LIB_DIR} ${MKDIR} ${USR_LIB_DIR}
${MKDIR} ${USR_VAR_DIR} ${MKDIR} ${USR_VAR_DIR}
install_modules: install_modules:
${MAKE} -C ${ALIB_DIR} install # ${MAKE} -C ${ALIB_DIR} install
${MAKE} -C ${GETID3_DIR} install ${MAKE} -C ${GETID3_DIR} install
${MAKE} -C ${HTML_UI_DIR} install ${MAKE} -C ${HTML_UI_DIR} install
${MAKE} -C ${STORAGE_ADMIN_DIR} install ${MAKE} -C ${STORAGE_ADMIN_DIR} install
${MAKE} -C ${STORAGE_SERVER_DIR} install ${MAKE} -C ${STORAGE_SERVER_DIR} install
${MAKE} -C ${CORE_DIR} install # ${MAKE} -C ${CORE_DIR} install
${MAKE} -C ${AUTHENTICATION_DIR} install # ${MAKE} -C ${AUTHENTICATION_DIR} install
${MAKE} -C ${DB_DIR} install # ${MAKE} -C ${DB_DIR} install
${MAKE} -C ${STORAGE_CLIENT_DIR} install # ${MAKE} -C ${STORAGE_CLIENT_DIR} install
${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install # ${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
${MAKE} -C ${EVENT_SCHEDULER_DIR} install # ${MAKE} -C ${EVENT_SCHEDULER_DIR} install
${MAKE} -C ${SCHEDULER_CLIENT_DIR} install # ${MAKE} -C ${SCHEDULER_CLIENT_DIR} install
${MAKE} -C ${WIDGETS_DIR} install # ${MAKE} -C ${WIDGETS_DIR} install
install_products: #install_products:
${MAKE} -C ${SCHEDULER_DIR} install # ${MAKE} -C ${SCHEDULER_DIR} install
${MAKE} -C ${GLIVESUPPORT_DIR} install # ${MAKE} -C ${GLIVESUPPORT_DIR} install

100
etc/configure.ac
View File

@ -32,23 +32,23 @@ AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2010 Sourcefabric O.P.S. under the GNU GPL]) AC_COPYRIGHT([Copyright (c) 2010 Sourcefabric O.P.S. under the GNU GPL])
AC_REVISION($Revision$) AC_REVISION($Revision$)
AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx) dnl AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx)
AC_PROG_CC() dnl AC_PROG_CC()
AC_PROG_CXX() dnl AC_PROG_CXX()
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify whether debug info should be compiled into the executable dnl specify whether debug info should be compiled into the executable
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(DEBUG) dnl AC_SUBST(DEBUG)
AC_ARG_ENABLE([debug], dnl AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug], [compile with debug info (no)]), dnl AC_HELP_STRING([--enable-debug], [compile with debug info (no)]),
[DEBUG=${enable_debug}], dnl [DEBUG=${enable_debug}],
[DEBUG=no]) dnl [DEBUG=no])
AC_MSG_RESULT([compiling with debug info: ${DEBUG}]) dnl AC_MSG_RESULT([compiling with debug info: ${DEBUG}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -245,29 +245,29 @@ AC_MSG_RESULT([using audio output device for the station: ${STATION_AUDIO_OUT}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify the audio output device for the studio dnl specify the audio output device for the studio
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(STUDIO_AUDIO_OUT) dnl AC_SUBST(STUDIO_AUDIO_OUT)
AC_ARG_WITH([studio-audio-out], dnl AC_ARG_WITH([studio-audio-out],
AC_HELP_STRING([--with-studio-audio-out], dnl AC_HELP_STRING([--with-studio-audio-out],
[use the specified audio output device for the studio, dnl [use the specified audio output device for the studio,
either ALSA or OSS (default)]), dnl either ALSA or OSS (default)]),
[STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=default]) dnl [STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}]) dnl AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify the audio output device for the studio for cueing dnl specify the audio output device for the studio for cueing
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(STUDIO_AUDIO_CUE) dnl AC_SUBST(STUDIO_AUDIO_CUE)
AC_ARG_WITH([studio-audio-cue], dnl AC_ARG_WITH([studio-audio-cue],
AC_HELP_STRING([--with-studio-audio-cue], dnl AC_HELP_STRING([--with-studio-audio-cue],
[use the specified audio cue device for the studio, dnl [use the specified audio cue device for the studio,
either ALSA or OSS (default)]), dnl either ALSA or OSS (default)]),
[STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=default]) dnl [STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=default])
AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}]) dnl AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -279,8 +279,8 @@ dnl fancy variables to avoid duplication of hard-coded values :(
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl set up the alib module dnl set up the alib module
AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure],
[../src/modules/alib/bin/autogen.sh]) dnl [../src/modules/alib/bin/autogen.sh])
dnl set up the getid3 module dnl set up the getid3 module
AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure], AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure],
@ -299,57 +299,51 @@ AC_CONFIG_COMMANDS([../src/modules/storageServer/tmp/configure],
[../src/modules/storageServer/bin/autogen.sh]) [../src/modules/storageServer/bin/autogen.sh])
dnl set up the core module dnl set up the core module
AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure],
[../src/modules/core/bin/autogen.sh]) dnl [../src/modules/core/bin/autogen.sh])
dnl set up the authentication module dnl set up the authentication module
AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure],
[../src/modules/authentication/bin/autogen.sh]) dnl [../src/modules/authentication/bin/autogen.sh])
dnl set up the db module dnl set up the db module
AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure],
[../src/modules/db/bin/autogen.sh]) dnl [../src/modules/db/bin/autogen.sh])
dnl set up the storage client module dnl set up the storage client module
AC_CONFIG_COMMANDS([../src/modules/storageClient/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/storageClient/tmp/configure],
[../src/modules/storageClient/bin/autogen.sh]) dnl [../src/modules/storageClient/bin/autogen.sh])
dnl set up the playlist executor module dnl set up the playlist executor module
AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure],
[../src/modules/playlistExecutor/bin/autogen.sh]) dnl [../src/modules/playlistExecutor/bin/autogen.sh])
dnl set up the event scheduler module dnl set up the event scheduler module
AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure],
[../src/modules/eventScheduler/bin/autogen.sh]) dnl [../src/modules/eventScheduler/bin/autogen.sh])
dnl set up the scheduler client module dnl set up the scheduler client module
AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure],
[../src/modules/schedulerClient/bin/autogen.sh]) dnl [../src/modules/schedulerClient/bin/autogen.sh])
dnl set up the widgets module dnl set up the widgets module
AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure],
[../src/modules/widgets/bin/autogen.sh]) dnl [../src/modules/widgets/bin/autogen.sh])
dnl set up the scheduler product dnl set up the scheduler product
AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure],
[../src/products/scheduler/bin/autogen.sh]) dnl [../src/products/scheduler/bin/autogen.sh])
dnl set up the gLiveSupport product dnl set up the gLiveSupport product
AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure], dnl AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure],
[../src/products/gLiveSupport/bin/autogen.sh]) dnl [../src/products/gLiveSupport/bin/autogen.sh])
dnl display status info on what libraries will get compiled dnl display status info on what libraries will get compiled
AC_MSG_NOTICE( AC_MSG_NOTICE(
[compiling the following external libraries that are needed [
by Campcaster:
libodbc++ 0.2.5
taglib 1.5
xmlrpc++ 2004-07-13
using the following configuration settings: using the following configuration settings:
hostname: ${HOSTNAME} hostname: ${HOSTNAME}
@ -362,8 +356,6 @@ using the following configuration settings:
database user: ${DB_USER} database user: ${DB_USER}
database user password: ${DB_PASSWORD} database user password: ${DB_PASSWORD}
station audio output device: ${STATION_AUDIO_OUT} station audio output device: ${STATION_AUDIO_OUT}
studio audio output device: ${STUDIO_AUDIO_OUT}
studio audio cue device: ${STUDIO_AUDIO_CUE}
creating Campcaster database: ${CREATE_LS_DATABASE} creating Campcaster database: ${CREATE_LS_DATABASE}
creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}
initialize Campcaster database: ${INIT_LS_DATABASE} initialize Campcaster database: ${INIT_LS_DATABASE}

35
src/modules/alib/etc/Makefile.in
View File

@ -85,28 +85,27 @@ TEST_RUNNER = ${PHP_DIR}/tests/index.php
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Targets # Targets
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
.PHONY: all dir_setup doc clean docclean depclean distclean dist install .PHONY: all clean depclean distclean dist install
.PHONY: db_init db_clean
all: all:
dir_setup: ${DOXYGEN_DIR} #dir_setup: ${DOXYGEN_DIR}
doc: #doc:
${DOXYGEN} ${DOXYGEN_CONFIG} # ${DOXYGEN} ${DOXYGEN_CONFIG}
clean: db_clean clean:
# ${RM} ... # ${RM} ...
docclean: #docclean:
${RMDIR} ${DOXYGEN_DIR}/html # ${RMDIR} ${DOXYGEN_DIR}/html
depclean: clean depclean: clean
dist: all #dist: all
${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} * # ${TAR_C} ${MODULE_NAME}${DATE}${DIST_EXT} *
distclean: clean docclean distclean: clean
# ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* # ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te*
#check: all ${TEST_RUNNER} #check: all ${TEST_RUNNER}
@ -126,19 +125,19 @@ install: all
# IMPORTANT: db_init and db_clean are commented out only for Campcaster, # IMPORTANT: db_init and db_clean are commented out only for Campcaster,
# where alib is initialized through storageServer module # where alib is initialized through storageServer module
db_init: #db_init:
# cd var/install; php -q install.php # cd var/install; php -q install.php
db_clean: #db_clean:
# cd var/install; php -q uninstall.php # cd var/install; php -q uninstall.php
${TMP_DIR}: #${TMP_DIR}:
${MKDIR} ${TMP_DIR} # ${MKDIR} ${TMP_DIR}
${DOXYGEN_DIR}: #${DOXYGEN_DIR}:
${MKDIR} ${DOXYGEN_DIR} # ${MKDIR} ${DOXYGEN_DIR}
${TEST_RUNNER}: #${TEST_RUNNER}:
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Pattern rules # Pattern rules

2
src/modules/htmlUI/var/formmask/mdata_relations.inc.php
View File

@ -36,7 +36,7 @@ $relations = array(
'ls:artisturl' => 'Artist web page', 'ls:artisturl' => 'Artist web page',
'ls:audiosourceurl' => 'Audio source web page', 'ls:audiosourceurl' => 'Audio source web page',
'ls:radiostationurl' => 'Radio station web page', 'ls:radiostationurl' => 'Radio station web page',
'ls:buycdurl' => 'Buy CD web page', 'ls:buycdurl' => '"Buy This Music" page',
'ls:isrcnumber' => 'ISRC number', 'ls:isrcnumber' => 'ISRC number',
'ls:catalognumber' => 'Catalog number', 'ls:catalognumber' => 'Catalog number',
'ls:originalartist' => 'Original artist', 'ls:originalartist' => 'Original artist',

47
src/modules/htmlUI/var/ui_base.inc.php
View File

@ -500,7 +500,7 @@ class uiBase
$res = $CC_DBC->query("SELECT to_hex($gunid)"); $res = $CC_DBC->query("SELECT to_hex($gunid)");
$row = $res->fetchRow(); $row = $res->fetchRow();
return $row['to_hex']; return $row['to_hex'];
} // fn toHex }
public function toInt8($gunid) public function toInt8($gunid)
@ -509,7 +509,7 @@ class uiBase
$res = $CC_DBC->query("SELECT x'$gunid'::bigint"); $res = $CC_DBC->query("SELECT x'$gunid'::bigint");
$row = $res->fetchRow(); $row = $res->fetchRow();
return $row['int8']; return $row['int8'];
} // fn toInt8 }
/** /**
@ -524,10 +524,10 @@ class uiBase
} }
$args = func_get_args(); $args = func_get_args();
$_SESSION['alertMsg'] .= call_user_func_array('tra', $args).'\n'; $_SESSION['alertMsg'] .= call_user_func_array('tra', $args).'\n';
} // fn _retMsg }
public function getPLMetaInfo($id) public function getPLMetaInfo($id)
{ {
$data = array('id' => $id, $data = array('id' => $id,
'title' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_TITLE), 'title' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_TITLE),
@ -535,9 +535,9 @@ class uiBase
'duration' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_DURATION), 'duration' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_DURATION),
'type' => 'playlist', 'type' => 'playlist',
); );
return ($data); return ($data);
} }
public function getMetaInfo($id) public function getMetaInfo($id)
{ {
$type = strtolower(GreenBox::getFileType($id)); $type = strtolower(GreenBox::getFileType($id));
@ -553,7 +553,7 @@ class uiBase
'sampleRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SAMPLERATE) : NULL, 'sampleRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SAMPLERATE) : NULL,
); );
return ($data); return ($data);
} // fn getMetaInfo }
public function getMetadataValue($id, $key, $langid=NULL, $deflangid=UI_DEFAULT_LANGID) public function getMetadataValue($id, $key, $langid=NULL, $deflangid=UI_DEFAULT_LANGID)
@ -566,37 +566,16 @@ class uiBase
} }
return $this->gb->getMetadataValue($id, $key, $this->sessid, $langid, $deflangid); return $this->gb->getMetadataValue($id, $key, $this->sessid, $langid, $deflangid);
} // fn getMetadataValue }
public function setMetadataValue($id, $key, $value, $langid=NULL) public function setMetadataValue($id, $key, $value)
{ {
if (!$langid) { if ($this->gb->setMetadataValue($id, $key, $this->sessid, $value)) {
$langid = UI_DEFAULT_LANGID;
}
// if (ini_get('magic_quotes_gpc')) {
// $value = str_replace("\'", "'", $value);
// }
if ($this->gb->setMetadataValue($id, $key, $this->sessid, $value, $langid)) {
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} // fn setMetadataValue }
/**
* @param unknown_type $id
* @return string/FALSE
*/
// private function _getFileTitle($id)
// {
// if (is_array($arr = GreenBox::GetPath($id))) {
// $file = array_pop($arr);
// return $file['name'];
// }
// return FALSE;
// } // fn _getFileTitle
public static function formElementEncode($str) public static function formElementEncode($str)
@ -604,7 +583,7 @@ class uiBase
$str = str_replace(':', '__', $str); $str = str_replace(':', '__', $str);
#$str = str_replace('.', '_', $str); #$str = str_replace('.', '_', $str);
return $str; return $str;
} // fn formElementEncode }
public static function formElementDecode($str) public static function formElementDecode($str)
@ -612,7 +591,7 @@ class uiBase
$str = str_replace('__', ':', $str); $str = str_replace('__', ':', $str);
#$str = str_replace('_', '.', $str); #$str = str_replace('_', '.', $str);
return $str; return $str;
} // fn formElementDecode }
} // class uiBase } // class uiBase
?> ?>

9
src/modules/htmlUI/var/ui_handler.class.php
View File

@ -472,23 +472,26 @@ class uiHandler extends uiBase {
foreach ($mask['pages'] as $key => $val) { foreach ($mask['pages'] as $key => $val) {
foreach ($mask['pages'][$key] as $k => $v) { foreach ($mask['pages'][$key] as $k => $v) {
$formdata[$key.'___'.uiBase::formElementEncode($v['element'])] ? $mData[uiBase::formElementDecode($v['element'])] = $formdata[$key.'___'.uiBase::formElementEncode($v['element'])] : NULL; $element = uiBase::formElementEncode($v['element']);
if ($formdata[$key.'___'.$element])
$mData[uiBase::formElementDecode($v['element'])] = $formdata[$key.'___'.$element];
} }
} }
$_SESSION["debug"] = $mData;
if (!count($mData)) { if (!count($mData)) {
return; return;
} }
foreach ($mData as $key => $val) { foreach ($mData as $key => $val) {
$r = $this->setMetadataValue($id, $key, $val, $curr_langid); $r = $this->setMetadataValue($id, $key, $val);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
$this->_retMsg('Unable to set "$1" to value "$2".', $key, $val); $this->_retMsg('Unable to set "$1" to value "$2".', $key, $val);
} }
} }
$this->_retMsg('Audioclip metadata has been updated.'); $this->_retMsg('Audioclip metadata has been updated.');
} // fn editMetadata }
/** /**

0
src/modules/alib/var/Alib.php → src/modules/storageServer/var/Alib.php
View File

38
src/modules/storageServer/var/BasicStor.php
View File

@ -54,9 +54,9 @@ define('GBERR_GUNID', 53);
define('GBERR_BGERR', 54); define('GBERR_BGERR', 54);
define('GBERR_NOTIMPL', 69); define('GBERR_NOTIMPL', 69);
require_once(dirname(__FILE__)."/../../alib/var/Alib.php"); require_once(dirname(__FILE__)."/Alib.php");
require_once("StoredFile.php"); require_once(dirname(__FILE__)."/StoredFile.php");
require_once("Transport.php"); require_once(dirname(__FILE__)."/Transport.php");
$g_metadata_xml_to_db_mapping = array( $g_metadata_xml_to_db_mapping = array(
'dc:format' => "format", 'dc:format' => "format",
@ -72,7 +72,37 @@ $g_metadata_xml_to_db_mapping = array(
"ls:filename" => "name", "ls:filename" => "name",
"ls:year" => "year", "ls:year" => "year",
"ls:url" => "url", "ls:url" => "url",
"ls:track_num" => "track_number"); "ls:track_num" => "track_number",
"ls:mood" => "mood",
"ls:bpm" => "bpm",
"ls:disc_num" => "disc_number",
"ls:rating" => "rating",
"ls:encoded_by" => "encoded_by",
"dc:publisher" => "label",
"ls:composer" => "composer",
"ls:encoder" => "encoder",
"ls:crc" => "checksum",
"ls:lyrics" => "lyrics",
"ls:orchestra" => "orchestra",
"ls:conductor" => "conductor",
"ls:lyricist" => "lyricist",
"ls:originallyricist" => "original_lyricist",
"ls:radiostationname" => "radio_station_name",
"ls:audiofileinfourl" => "info_url",
"ls:artisturl" => "artist_url",
"ls:audiosourceurl" => "audio_source_url",
"ls:radiostationurl" => "radio_station_url",
"ls:buycdurl" => "buy_this_url",
"ls:isrcnumber" => "isrc_number",
"ls:catalognumber" => "catalog_number",
"ls:originalartist" => "original_artist",
"dc:rights" => "copyright",
"dcterms:temporal" => "report_datetime",
"dcterms:spatial" => "report_location",
"dcterms:entity" => "report_organization",
"dc:subject" => "subject",
"dc:contributor" => "contributor",
"dc:language" => "language");
/** /**
* Core of Campcaster file storage module * Core of Campcaster file storage module

89
src/modules/storageServer/var/GreenBox.php
View File

@ -87,8 +87,7 @@ class GreenBox extends BasicStor {
return $storedFile; return $storedFile;
} }
$oid = $storedFile->getId(); $oid = $storedFile->getId();
$r = $this->bsSetMetadataValue( $r = $this->bsSetMetadataValue($oid, 'ls:url', $url);
$oid, 'ls:url', $url, NULL, NULL, 'metadata');
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
} }
@ -356,18 +355,14 @@ class GreenBox extends BasicStor {
* Session id * Session id
* @param string $value * @param string $value
* The value to store, if NULL then delete record * The value to store, if NULL then delete record
* @param string $lang
* xml:lang value for select language version
* @param int $mid
* (optional on unique elements) Metadata record id
* @return boolean * @return boolean
*/ */
public function setMetadataValue($id, $category, $sessid, $value, $lang=NULL, $mid=NULL) public function setMetadataValue($id, $category, $sessid, $value)
{ {
if (($res = BasicStor::Authorize('write', $id, $sessid)) !== TRUE) { if (($res = BasicStor::Authorize('write', $id, $sessid)) !== TRUE) {
return $res; return $res;
} }
return $this->bsSetMetadataValue($id, $category, $value /*, $lang, $mid*/); return $this->bsSetMetadataValue($id, $category, $value);
} // fn setMetadataValue } // fn setMetadataValue
@ -474,31 +469,31 @@ class GreenBox extends BasicStor {
{ {
$pl = new Playlist(); $pl = new Playlist();
$pl = $pl->create($fname); $pl = $pl->create($fname);
return $pl; return $pl;
} // fn createPlaylist } // fn createPlaylist
public function setPLMetadataValue($id, $category, $value, $lang=NULL, $mid=NULL) public function setPLMetadataValue($id, $category, $value, $lang=NULL, $mid=NULL)
{ {
$pl = Playlist::Recall($id); $pl = Playlist::Recall($id);
if($pl === FALSE) if($pl === FALSE)
return FALSE; return FALSE;
$res = $pl->setPLMetaData($category, $value, $lang); $res = $pl->setPLMetaData($category, $value, $lang);
return $res; return $res;
} }
public function getPLMetadataValue($id, $category, $langId=NULL) public function getPLMetadataValue($id, $category, $langId=NULL)
{ {
$pl = Playlist::Recall($id); $pl = Playlist::Recall($id);
if($pl === FALSE) if($pl === FALSE)
return FALSE; return FALSE;
$res = $pl->getPLMetaData($category); $res = $pl->getPLMetaData($category);
return $res; return $res;
} }
@ -533,12 +528,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->getContents(); $res = $pl->getContents();
if(is_null($res)) if(is_null($res))
return array(); return array();
return $res; return $res;
} // fn getPlaylistArray } // fn getPlaylistArray
@ -555,10 +550,10 @@ class GreenBox extends BasicStor {
*/ */
public function lockPlaylistForEdit($id, $sessid) { public function lockPlaylistForEdit($id, $sessid) {
$pl = Playlist::Recall($id); $pl = Playlist::Recall($id);
if($pl === FALSE) if($pl === FALSE)
return; return;
$res = $pl->lock($sessid); $res = $pl->lock($sessid);
} }
@ -572,10 +567,10 @@ class GreenBox extends BasicStor {
*/ */
public function releaseLockedPlaylist($id, $sessid) { public function releaseLockedPlaylist($id, $sessid) {
$pl = Playlist::Recall($id); $pl = Playlist::Recall($id);
if($pl === FALSE) if($pl === FALSE)
return FALSE; return FALSE;
$res = $pl->unlock($sessid); $res = $pl->unlock($sessid);
return $res; return $res;
} }
@ -609,9 +604,9 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->addAudioClip($acId, $pos, $fadeIn, $fadeOut, $cliplength, $cueIn, $cueOut); $res = $pl->addAudioClip($acId, $pos, $fadeIn, $fadeOut, $cliplength, $cueIn, $cueOut);
return $res; return $res;
} // fn addAudioClipToPlaylist } // fn addAudioClipToPlaylist
@ -632,12 +627,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->delAudioClip($pos); $res = $pl->delAudioClip($pos);
return $res; return $res;
} }
/** /**
* Move audioClip to the new position in the playlist. * Move audioClip to the new position in the playlist.
* *
@ -658,12 +653,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->moveAudioClip($oldPos, $newPos); $res = $pl->moveAudioClip($oldPos, $newPos);
return $res; return $res;
} }
/** /**
* Change fadeInfo values * Change fadeInfo values
* *
@ -681,12 +676,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->changeFadeInfo($pos, $fadeIn, $fadeOut); $res = $pl->changeFadeInfo($pos, $fadeIn, $fadeOut);
return $res; return $res;
} }
/** /**
* Change cueIn/cueOut values for playlist element * Change cueIn/cueOut values for playlist element
* *
@ -707,12 +702,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->changeClipLength($pos, $cueIn, $cueOut); $res = $pl->changeClipLength($pos, $cueIn, $cueOut);
return $res; return $res;
} }
/** /**
* Delete a Playlist metafile. * Delete a Playlist metafile.
* *
@ -725,8 +720,8 @@ class GreenBox extends BasicStor {
public function deletePlaylist($id) public function deletePlaylist($id)
{ {
return Playlist::Delete($id); return Playlist::Delete($id);
} }
/** /**
* Find info about clip at specified offset in playlist. * Find info about clip at specified offset in playlist.
@ -885,7 +880,7 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} // fn existsPlaylist } // fn existsPlaylist
@ -908,12 +903,12 @@ class GreenBox extends BasicStor {
if ($pl === FALSE) { if ($pl === FALSE) {
return FALSE; return FALSE;
} }
$res = $pl->isEdited(); $res = $pl->isEdited();
if($res !== FALSE) if($res !== FALSE)
return $res; return $res;
return TRUE; return TRUE;
} // fn playlistIsAvailable } // fn playlistIsAvailable

3
src/modules/storageServer/var/LocStor.php
View File

@ -195,8 +195,7 @@ class LocStor extends BasicStor {
return $storedFile; return $storedFile;
} }
$oid = $storedFile->getId(); $oid = $storedFile->getId();
$r = $this-> bsSetMetadataValue( $r = $this-> bsSetMetadataValue($oid, 'ls:url', $url);
$oid, 'ls:url', $url /*, NULL, NULL, 'metadata'*/);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
return $r; return $r;
} }

0
src/modules/alib/var/Subjects.php → src/modules/storageServer/var/Subjects.php
View File

2
src/modules/storageServer/var/conf.php
View File

@ -124,7 +124,7 @@ $CC_CONFIG['subjTable'] = $CC_CONFIG['tblNamePrefix'].'subjs';
$CC_CONFIG['smembTable'] = $CC_CONFIG['tblNamePrefix'].'smemb'; $CC_CONFIG['smembTable'] = $CC_CONFIG['tblNamePrefix'].'smemb';
$CC_CONFIG['transTable'] = $CC_CONFIG['tblNamePrefix'].'trans'; $CC_CONFIG['transTable'] = $CC_CONFIG['tblNamePrefix'].'trans';
$CC_CONFIG['prefTable'] = $CC_CONFIG['tblNamePrefix'].'pref'; $CC_CONFIG['prefTable'] = $CC_CONFIG['tblNamePrefix'].'pref';
$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog'; //$CC_CONFIG['playlogTable'] = $CC_CONFIG['tblNamePrefix'].'playlog';
$CC_CONFIG['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule'; $CC_CONFIG['scheduleTable'] = $CC_CONFIG['tblNamePrefix'].'schedule';
$CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup'; $CC_CONFIG['backupTable'] = $CC_CONFIG['tblNamePrefix'].'backup';

2
src/modules/storageServer/var/install/campcaster-user.php
View File

@ -1,7 +1,7 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
require_once(dirname(__FILE__).'/../conf.php'); require_once(dirname(__FILE__).'/../conf.php');
require_once(dirname(__FILE__).'/../../../alib/var/Subjects.php'); require_once(dirname(__FILE__).'/../Subjects.php');
require_once('DB.php'); require_once('DB.php');
require_once('Console/Getopt.php'); require_once('Console/Getopt.php');

62
src/modules/storageServer/var/install/install.php
View File

@ -25,8 +25,14 @@ require_once(dirname(__FILE__).'/../GreenBox.php');
require_once(dirname(__FILE__)."/installInit.php"); require_once(dirname(__FILE__)."/installInit.php");
campcaster_db_connect(true); campcaster_db_connect(true);
$sql = "create language 'plpgsql'"; $langIsInstalled = $CC_DBC->GetOne('select count(*) FROM pg_language WHERE lanname = \'plpgsql\'');
camp_install_query($sql); if ($langIsInstalled == '0') {
echo " * Installing Postgres scripting language\n";
$sql = "CREATE LANGUAGE 'plpgsql'";
camp_install_query($sql);
} else {
echo " * Postgres scripting language already installed\n";
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Install database tables // Install database tables
@ -179,6 +185,36 @@ if (!camp_db_table_exists($CC_CONFIG['filesTable'])) {
track_number integer, track_number integer,
channels integer, channels integer,
url character varying(1024), url character varying(1024),
bpm character varying(8),
rating character varying(8),
encoded_by character varying(255),
disc_number character varying(8),
mood character varying(64),
label character varying(512),
composer character varying(512),
encoder character varying(64),
checksum character varying(256),
lyrics text,
orchestra character varying(512),
conductor character varying(512),
lyricist character varying(512),
original_lyricist character varying(512),
radio_station_name character varying(512),
info_url character varying(512),
artist_url character varying(512),
audio_source_url character varying(512),
radio_station_url character varying(512),
buy_this_url character varying(512),
isrc_number character varying(512),
catalog_number character varying(512),
original_artist character varying(512),
copyright character varying(512),
report_datetime character varying(32),
report_location character varying(512),
report_organization character varying(512),
subject character varying(512),
contributor character varying(512),
\"language\" character varying(512),
CONSTRAINT cc_files_pkey PRIMARY KEY (id), CONSTRAINT cc_files_pkey PRIMARY KEY (id),
CONSTRAINT cc_files_editedby_fkey FOREIGN KEY (editedby) CONSTRAINT cc_files_editedby_fkey FOREIGN KEY (editedby)
REFERENCES cc_subjs (id) MATCH SIMPLE REFERENCES cc_subjs (id) MATCH SIMPLE
@ -416,17 +452,17 @@ if (!camp_db_table_exists($CC_CONFIG['scheduleTable'])) {
} }
if (!camp_db_table_exists($CC_CONFIG['playlogTable'])) { //if (!camp_db_table_exists($CC_CONFIG['playlogTable'])) {
echo " * Creating database table ".$CC_CONFIG['playlogTable']."..."; // echo " * Creating database table ".$CC_CONFIG['playlogTable']."...";
$sql = "CREATE TABLE ".$CC_CONFIG['playlogTable']."(" // $sql = "CREATE TABLE ".$CC_CONFIG['playlogTable']."("
." id BIGINT NOT NULL," // ." id BIGINT NOT NULL,"
." audioClipId BIGINT NOT NULL," // ." audioClipId BIGINT NOT NULL,"
." timestamp TIMESTAMP NOT NULL," // ." timestamp TIMESTAMP NOT NULL,"
." PRIMARY KEY(id))"; // ." PRIMARY KEY(id))";
camp_install_query($sql); // camp_install_query($sql);
} else { //} else {
echo " * Skipping: database table already exists: ".$CC_CONFIG['playlogTable']."\n"; // echo " * Skipping: database table already exists: ".$CC_CONFIG['playlogTable']."\n";
} //}
if (!camp_db_table_exists($CC_CONFIG['backupTable'])) { if (!camp_db_table_exists($CC_CONFIG['backupTable'])) {

14
src/modules/storageServer/var/install/uninstall.php
View File

@ -193,13 +193,13 @@ if (camp_db_table_exists($CC_CONFIG['backupTable'])) {
echo " * Skipping: database table ".$CC_CONFIG['backupTable']."\n"; echo " * Skipping: database table ".$CC_CONFIG['backupTable']."\n";
} }
if (camp_db_table_exists($CC_CONFIG['playlogTable'])) { //if (camp_db_table_exists($CC_CONFIG['playlogTable'])) {
echo " * Removing database table ".$CC_CONFIG['playlogTable']."..."; // echo " * Removing database table ".$CC_CONFIG['playlogTable']."...";
$sql = "DROP TABLE ".$CC_CONFIG['playlogTable']; // $sql = "DROP TABLE ".$CC_CONFIG['playlogTable'];
camp_install_query($sql); // camp_install_query($sql);
} else { //} else {
echo " * Skipping: database table ".$CC_CONFIG['playlogTable']."\n"; // echo " * Skipping: database table ".$CC_CONFIG['playlogTable']."\n";
} //}
echo "************************************\n"; echo "************************************\n";
echo "* StorageServer Uninstall Complete *\n"; echo "* StorageServer Uninstall Complete *\n";