more work in examples; documentation is now up to date

exampleDatabase/Makefile

@@ -6,7 +6,7 @@ DIRS += configure
 DIRS += src
 src_DEPEND_DIRS = configure
 
-DIRS += example
+DIRS += ioc
 test_DEPEND_DIRS = src
 
 DIRS += iocBoot

exampleDatabase/configure/ExampleRELEASE.local

@@ -5,4 +5,5 @@ PVCOMMON=${EPICSV4HOME}/pvCommonCPP
 PVDATA=${EPICSV4HOME}/pvDataCPP
 PVACCESS=${EPICSV4HOME}/pvAccessCPP
 PVDATABASE=${EPICSV4HOME}/pvDatabaseCPP
+PVDATABASETEST=${EPICSV4HOME}/pvDatabaseCPP/test
 PVASRV=${EPICSV4HOME}/pvaSrv

exampleDatabase/example/src/exampleDatabaseInclude.dbd

@@ -1,3 +0,0 @@
-include "base.dbd"
-include "PVAServerRegister.dbd"
-registrar("exampleDatabaseRegister")

exampleDatabase/example/src/exampleDatabaseMain.cpp

@@ -1,57 +0,0 @@
-/*exampleDatabaseMain.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvData is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
- */
-/**
- * @author mrk
- */
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <vector>
-#include <iostream>
-
-#include <pv/channelProviderLocal.h>
-#include <pv/exampleDatabase.h>
-#include <pv/serverContext.h>
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-
-int main(int argc,char *argv[])
-{
-    PVDatabasePtr master = PVDatabase::getMaster();
-    ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
-    ExampleDatabase::create();
-    ServerContext::shared_pointer ctx =
-        startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
-    cout << "exampleDatabase\n";
-    PVStringArrayPtr pvNames = master->getRecordNames();
-    String buffer;
-    pvNames->toString(&buffer);
-    cout << "recordNames" << endl << buffer << endl;
-    string str;
-    while(true) {
-        cout << "Type exit to stop: \n";
-        getline(cin,str);
-        if(str.compare("exit")==0) break;
-
-    }
-    ctx->destroy();
-    epicsThreadSleep(1.0);
-    channelProvider->destroy();
-    return 0;
-}
-

exampleDatabase/ioc/src/Makefile

@@ -30,6 +30,7 @@ exampleDatabase_LIBS += pvData pvAccess
 exampleDatabase_LIBS += pvDatabase
 exampleDatabase_LIBS += pvaSrv
 exampleDatabase_LIBS += exampleDatabase
+exampleDatabase_LIBS += powerSupply
 exampleDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #===========================

exampleDatabase/ioc/src/exampleDatabaseInclude.dbd

@@ -0,0 +1,6 @@
+include "base.dbd"
+include "PVAServerRegister.dbd"
+include "registerChannelProviderLocal.dbd"
+include "dbPv.dbd"
+include "powerSupplyRegister.dbd"
+registrar("exampleDatabaseRegister")

exampleDatabase/ioc/src/exampleDatabaseMain.cpp

@@ -0,0 +1,33 @@
+/*exampleDatabaseMain.cpp */
+/**
+ * Copyright - See the COPYRIGHT that is included with this distribution.
+ * EPICS pvData is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution.
+ */
+/**
+ * @author mrk
+ */
+
+/* Author: Marty Kraimer */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "epicsExit.h"
+#include "epicsThread.h"
+#include "iocsh.h"
+
+int main(int argc,char *argv[])
+{
+    if(argc>=2) {
+        iocsh(argv[1]);
+        epicsThreadSleep(.2);
+    }
+    iocsh(NULL);
+    epicsExit(0);
+    return(0);
+}
+

exampleDatabase/src/Makefile

@@ -17,6 +17,7 @@ exampleDatabaseMain_LIBS += pvData
 exampleDatabaseMain_LIBS += pvAccess
 exampleDatabaseMain_LIBS += pvDatabase
 exampleDatabaseMain_LIBS += exampleDatabase
+exampleDatabaseMain_LIBS += powerSupply
 
 DBD += exampleDatabase.dbd
 

exampleDatabase/src/exampleDatabase.cpp

@@ -22,7 +22,7 @@
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
-#include <pv/powerSupplyRecordTest.h>
+#include <pv/powerSupply.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/recordList.h>
 #include <pv/traceRecord.h>
@@ -39,28 +39,6 @@ static StandardFieldPtr standardField = getStandardField();
 static PVDataCreatePtr pvDataCreate = getPVDataCreate();
 static StandardPVFieldPtr standardPVField = getStandardPVField();
 
-static PVStructurePtr createPowerSupply()
-{
-    size_t nfields = 5;
-    StringArray names;
-    names.reserve(nfields);
-    FieldConstPtrArray powerSupply;
-    powerSupply.reserve(nfields);
-    names.push_back("alarm");
-    powerSupply.push_back(standardField->alarm());
-    names.push_back("timeStamp");
-    powerSupply.push_back(standardField->timeStamp());
-    String properties("alarm,display");
-    names.push_back("voltage");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    names.push_back("power");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    names.push_back("current");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    return pvDataCreate->createPVStructure(
-            fieldCreate->createStructure(names,powerSupply));
-}
-
 static void createStructureArrayRecord(
     PVDatabasePtr const &master,
     ScalarType scalarType,
@@ -122,10 +100,10 @@ void ExampleDatabase::create()
     createStructureArrayRecord(master,pvDouble,"exampleStructureArray");
     recordName = "examplePowerSupply";
     PVStructurePtr pvStructure = createPowerSupply();
-    PowerSupplyRecordTestPtr psr =
-        PowerSupplyRecordTest::create(recordName,pvStructure);
+    PowerSupplyPtr psr =
+        PowerSupply::create(recordName,pvStructure);
     if(psr.get()==NULL) {
-        cout << "PowerSupplyRecordTest::create failed" << endl;
+        cout << "PowerSupply::create failed" << endl;
         return;
     }
     result = master->addRecord(psr);

exampleDatabase/src/exampleDatabaseMain.cpp

@@ -42,9 +42,6 @@ int main(int argc,char *argv[])
     String buffer;
     pvNames->toString(&buffer);
     cout << "recordNames" << endl << buffer << endl;
-    PVRecordPtr pvRecord = master->findRecord("laptoprecordListPGRPC");
-    PVStructurePtr pvStructure = pvRecord->getPVRecordStructure()->getPVStructure();
-    cout << "PVStructure" << endl << pvStructure->dumpValue(cout) << endl;
     string str;
     while(true) {
         cout << "Type exit to stop: \n";