From d3c594134cc03e23860fae463086e885195134db Mon Sep 17 00:00:00 2001
From: blaakmeer <sdos@astron.nl>
Date: Thu, 21 Sep 2006 09:48:59 +0000
Subject: [PATCH] BugID: 752 Removed logging inside dpAccessable() to the
calling functions. Replaced all Debug[T][N] calls with LOG_TRACE, LOG_WARN,
LOG_INFO or LOG_ERROR calls which results in clearer loggings. This should
also be done for all nav_usr panels
---
.../scripts/libs/nav_fw/fwTreeView.ctl | 4 +-
.../scripts/libs/nav_fw/gcf-common.ctl | 45 ++++++++++++++----
.../scripts/libs/nav_fw/gcf-util.ctl | 1 -
.../nav_fw/gcfnav-configuration-functions.ctl | 21 +++++----
.../scripts/libs/nav_fw/gcfnav-functions.ctl | 23 ++++++++--
.../libs/nav_fw/gcfnav-tab-functions.ctl | 19 ++++----
.../scripts/libs/nav_fw/gcfnav_plotrecord.ctl | 36 +++++++++++++++
.../scripts/libs/nav_fw/gcfnav_view.ctl | 19 +++++---
.../scripts/libs/nav_fw/gcfpa-com.ctl | 26 +++++++++++
.../scripts/libs/nav_fw/gcfpa-cwd.ctl | 26 +++++++++++
.../scripts/libs/nav_fw/gcfpa-pml.ctl | 26 +++++++++++
.../scripts/libs/nav_fw/gcfpa-prep.ctl | 26 +++++++++++
.../scripts/libs/nav_fw/treeView.ctl | 46 ++++++++++++-------
13 files changed, 258 insertions(+), 60 deletions(-)
diff --git a/MAC/Navigator/scripts/libs/nav_fw/fwTreeView.ctl b/MAC/Navigator/scripts/libs/nav_fw/fwTreeView.ctl
index c247a5dc2d6..47b19f340a0 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/fwTreeView.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/fwTreeView.ctl
@@ -232,7 +232,7 @@ unsigned fwTreeView_appendToParentNode(unsigned parentIndex, string name, anytyp
{ // simply append it to the tree, because the parent is the root or undefined
fwTreeView_appendNode(name,value,handle,level,referenceName);
nodeId = fwTreeView_getNodeCount(referenceName);
- DebugTN("in fwTreeView_appendToParentNode: node appended, parent is root or illegal");
+ LOG_TRACE("in fwTreeView_appendToParentNode: node appended, parent is root or illegal");
}
else
{
@@ -242,7 +242,7 @@ unsigned fwTreeView_appendToParentNode(unsigned parentIndex, string name, anytyp
{ // append node because parent is not exactly one level higher than the level of the node.
fwTreeView_appendNode(name,value,handle,level,referenceName);
nodeId = fwTreeView_getNodeCount(referenceName);
- DebugTN("in fwTreeView_appendToParentNode: requested level is not parent level + 1");
+ LOG_TRACE("in fwTreeView_appendToParentNode: requested level is not parent level + 1");
}
else
{
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
index bd2274ac6af..fbc7e4d1744 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcf-common.ctl
@@ -1,12 +1,30 @@
+//# gcf-common.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
-///////////////////////////////////////////////////////////////////////////
-// Function dpAccessable: Checks whether the given dpName is accessable and
-// existing (in case of a distributed system.
-//
-// Input : datapoint name, including systemName
-// Output: TRUE, if accessable and existing,
-// FALSE, if not accessable and/or not existing
-///////////////////////////////////////////////////////////////////////////
+//#
+//# Common GCF functions
+//#
+
+#uses "nav_fw/gcf-util.ctl"
global dyn_int g_distributedSystems;
global int g_distSysVarSem = 0;
@@ -23,6 +41,14 @@ void followDistributedSystems(string dp, dyn_int value)
g_distributedSystems = value;
}
+///////////////////////////////////////////////////////////////////////////
+// Function dpAccessable: Checks whether the given dpName is accessable and
+// existing (in case of a distributed system.
+//
+// Input : datapoint name, including systemName
+// Output: TRUE, if accessable and existing,
+// FALSE, if not accessable and/or not existing
+///////////////////////////////////////////////////////////////////////////
bool dpAccessable(string dpName)
{
if (dpExists(dpName))
@@ -51,13 +77,12 @@ bool dpAccessable(string dpName)
}
}
g_distSysVarSem--; // release "semaphore"
- DebugTN("Not accessible: ",dpName);
+ LOG_WARN("Not accessible: ",dpName);
return FALSE;
}
}
else
{
- DebugTN("Not existing: ",dpName);
return FALSE;
}
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
index 7b64e226cf8..7de7ba52fb5 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcf-util.ctl
@@ -170,7 +170,6 @@ void initLog()
err=getLastError();
if(dynlen(err)>0)
errorDialog(err);
- DebugTN("loglevel initialized to ",g_loglevel);
// monitor future updates:
dpConnect("loglevelUpdated",DPNAME_LOGLEVEL+".");
err=getLastError();
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
index 75f0ba97015..271759955a2 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-configuration-functions.ctl
@@ -168,6 +168,7 @@ void navConfigSetNavigatorID(int newID)
}
if (createConfiguration)
{
+ LOG_DEBUG("Creating new navigator configuration");
dpCreate(DPNAME_NAVIGATOR + g_navigatorID, DPTYPENAME_NAVIGATOR_INSTANCE);
}
dpSet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_USECOUNT, 0);
@@ -266,6 +267,10 @@ void navConfigSetSelectedElement(string datapointPath)
{
dpSet(dpSelectedElementContainer, dpSelectedElement);
}
+ else
+ {
+ LOG_WARN("Configuration element does not exist:",dpSelectedElementContainer);
+ }
}
///////////////////////////////////////////////////////////////////////////
@@ -635,7 +640,7 @@ string navConfigGetViewConfig(string datapointPath)
}
if (!dpAccessable(dpViewConfig))
{
- LOG_TRACE("navConfigGetViewConfig", "DP does not exist, using default configuration", dpViewConfig);
+ LOG_INFO("navConfigGetViewConfig", "DP does not exist, using default configuration", dpViewConfig);
dpViewConfig = "__nav_default_viewconfig";
}
LOG_TRACE(dpViewConfig);
@@ -741,7 +746,7 @@ bool navConfigSanityCheck(string &message)
if (!sane)
{
message = "Invalid view configuration\n#views and nrOfSubViews do not correspond\n(" + tab[viewsIndex][1] + ")";
- DebugTN(message);
+ LOG_WARN(message);
}
if (sane)
@@ -754,7 +759,7 @@ bool navConfigSanityCheck(string &message)
if (!sane)
{
message = "Invalid view configuration\n#subviews, #configs and total nrOfSubViews do not correspond\n(" + tab[viewsIndex][1] + ")";
- DebugTN(message);
+ LOG_WARN(message);
}
}
@@ -763,12 +768,11 @@ bool navConfigSanityCheck(string &message)
for (i = 1; i <= dynlen(tab[viewsIndex][2]) && sane; i++)
{
sane = dpAccessable(tab[viewsIndex][2][i]);
- LOG_TRACE("check view existance:", sane, tab[viewsIndex][2][i]);
}
if (!sane)
{
message = "Invalid view configuration\nview item (" + (i-1) + ") does not exist\n(" + tab[viewsIndex][1] + ")";
- DebugTN(message);
+ LOG_WARN(message);
}
}
@@ -777,12 +781,11 @@ bool navConfigSanityCheck(string &message)
for (i = 1; i <= dynlen(tab[subViewsIndex][2]) && sane; i++)
{
sane = dpAccessable(tab[subViewsIndex][2][i]);
- DebugTN("check subview existance:", sane, tab[subViewsIndex][2][i]);
}
if (!sane)
{
message = "Invalid view configuration\nsubview item (" + (i-1) + ") does not exist\n(" + tab[viewsIndex][1] + ")";
- DebugTN(message);
+ LOG_WARN(message);
}
}
@@ -791,12 +794,11 @@ bool navConfigSanityCheck(string &message)
for (i = 1; i <= dynlen(tab[configsIndex][2]) && sane; i++)
{
sane = dpAccessable(tab[configsIndex][2][i]);
- DebugTN("check configs existance:", sane, tab[configsIndex][2][i]);
}
if (!sane)
{
message = "Invalid view configuration\nconfig item (" + (i-1) + ") does not exist\n(" + tab[viewsIndex][1] + ")";
- DebugTN(message);
+ LOG_WARN(message);
}
}
@@ -916,6 +918,7 @@ bool navConfigConfigSubviewPermitted()
}
else
{
+ LOG_INFO("Subview configuration not permitted for this user");
return FALSE;
}
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
index aeea5c1f19c..add4c9ad563 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-functions.ctl
@@ -611,6 +611,10 @@ void treeAddDatapoints(dyn_string names)
{
dpGet(addingDPpart + "." + elementName, referenceContent);
}
+ else
+ {
+ LOG_WARN("Unable to get reference info for datapoint",addingDPpart + "." + elementName);
+ }
for (int k = 1; k <= dynlen(referenceContent); k++)
{
dyn_string referenceSplit = strsplit(referenceContent[k], "=");
@@ -960,10 +964,14 @@ void Navigator_HandleEventInitialize()
{
string datapointPath = buildPathFromNode(selectedNode);
string dpViewConfig = navConfigGetViewConfig(datapointPath);
- if (selectedNode != 0 && dpAccessable(dpViewConfig))
+ if (dpAccessable(dpViewConfig))
{
showView(dpViewConfig, datapointPath);
}
+ else
+ {
+ LOG_WARN("Unable to read view configuration",datapointPath,dpViewConfig);
+ }
}
LOG_DEBUG("~Navigator_HandleEventInitialize()");
@@ -1005,7 +1013,6 @@ void Navigator_HandleUpdateTrigger(string dpe, int trigger)
{
string newDatapoint;
dpGet(DPNAME_NAVIGATOR + g_navigatorID + "." + ELNAME_NEWDATAPOINT, newDatapoint);
- //if ((newDatapoint != "") && dpAccessable(newDatapoint)) Orginal
if (newDatapoint != "")
{
changeSelectedPosition(newDatapoint);
@@ -1075,10 +1082,14 @@ void TabViews_HandleEventSelectionChanged()
navConfigSetSelectedView(datapointPath, tabCtrl.activeRegister + 1);
string dpViewConfig = navConfigGetViewConfig(datapointPath);
- if (selectedNode != 0 && dpAccessable(dpViewConfig))
+ if (dpAccessable(dpViewConfig))
{
showActiveView(dpViewConfig, datapointPath);
}
+ else
+ {
+ LOG_WARN("Unable to read view configuration",datapointPath,dpViewConfig);
+ }
}
}
else
@@ -1331,7 +1342,7 @@ void ButtonMaximize_HandleEventClick()
string datapointPath = buildPathFromNode(Node);
string dpViewConfig = navConfigGetViewConfig(datapointPath);
LOG_TRACE("ButtonMaximize_HandleEventClick", Node, dpViewConfig);
- if (Node != 0 && dpAccessable(dpViewConfig))
+ if (dpAccessable(dpViewConfig))
{
int selectedView;
int selectedSubView;
@@ -1385,6 +1396,10 @@ void ButtonMaximize_HandleEventClick()
}
}
}
+ else
+ {
+ LOG_WARN("Unable to read view configuration",datapointPath,dpViewConfig);
+ }
}
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
index 031408382ba..c57d4818e93 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav-tab-functions.ctl
@@ -211,7 +211,7 @@ void ComboBoxViewsSelectionChanged()
if(viewsComboBoxCtrl.itemCount==0)
{
viewTabsCtrl.namedRegisterPanel(VIEW_TABS_VIEW_NAME, viewsPath + "nosubview.pnl",panelParameters);
- LOG_DEBUG("1. No subview configured for this datapoint type");
+ LOG_WARN("1. No subview configured for this datapoint type");
}
// else if(!dpAccessable(g_datapoint))
// {
@@ -221,31 +221,31 @@ void ComboBoxViewsSelectionChanged()
else if(access(getPath(PANELS_REL_PATH)+selectedPanel,F_OK) == 0 && selectedPanel!="")
{
viewTabsCtrl.namedRegisterPanel(VIEW_TABS_VIEW_NAME,selectedPanel,panelParameters);
- LOG_DEBUG("3 selectedPanel:", selectedPanel);
+ LOG_INFO("3 selectedPanel:", selectedPanel);
}
else if (selectedPanel=="0")
{
selectedPanel = viewsPath + "nopanel.pnl";
viewTabsCtrl.namedRegisterPanel(VIEW_TABS_VIEW_NAME, viewsPath + "nopanel.pnl",panelParameters);
- LOG_DEBUG("4 No panel configured for this subview");
+ LOG_WARN("4 No panel configured for this subview");
}
- else //3. The configured panel file for this subview has not been found
+ else //5. The configured panel file for this subview has not been found
{
string oldSelectedPanel = selectedPanel;
viewTabsCtrl.namedRegisterPanel(VIEW_TABS_VIEW_NAME, viewsPath + "nopanelfound.pnl",panelParameters);
- LOG_DEBUG("5. File does not exist:",oldSelectedPanel);
+ LOG_WARN("5. File does not exist:",oldSelectedPanel);
}
string datapointTypeName = "";
if(dpAccessable(g_datapoint+"__enabled"))
{
datapointTypeName = getDpTypeFromEnabled(g_datapoint);
- DebugTN("get typename from enabled",g_datapoint,datapointTypeName);
+ LOG_INFO("get typename from enabled",g_datapoint,datapointTypeName);
}
else if(dpAccessable(g_datapoint))
{
datapointTypeName = dpTypeName(g_datapoint);
- DebugTN("get typename not from enabled but it is accessible ",g_datapoint,datapointTypeName);
+ LOG_INFO("get typename not from enabled but it is accessible ",g_datapoint,datapointTypeName);
}
else
{
@@ -256,7 +256,7 @@ void ComboBoxViewsSelectionChanged()
{
datapointTypeName = substr(datapointTypeName, sepPos + 1);
}
- DebugTN("datapoint is not enabled and not accessible",g_datapoint,datapointTypeName);
+ LOG_INFO("datapoint is not enabled and not accessible",g_datapoint,datapointTypeName);
}
// Load the config panel in the viewTabsCtrl
@@ -277,7 +277,7 @@ void ComboBoxViewsSelectionChanged()
}
else
{
- LOG_DEBUG("File does not exist:",g_configPanelFileName);
+ LOG_WARN("File does not exist:",g_configPanelFileName);
}
}
@@ -305,7 +305,6 @@ bool ConfigTabAddSubViewClicked(string viewName, int selectedView, string select
"$configDatapoint:" + configDatapoint),
resultFloat,
resultString);
- DebugN(resultFloat);
success = resultFloat[1];
nrOfSubViews = resultFloat[2];
if(success)
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
index 8655f7469ab..b71cd1ef47c 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_plotrecord.ctl
@@ -1,6 +1,34 @@
+//# gcfnav_plotrecord.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
+
+//#
+//# Plot recording functions
+//#
+
+#uses "nav_fw/gcf-util.ctl"
#uses "nav_fw/gcf-common.ctl"
#uses "nav_fw/gcfnav-functions.ctl"
#uses "nav_fw/gcfnav_view.ctl"
+
global int g_counter=0;
global string g_path_temp = "";
global dyn_string recordList;
@@ -190,9 +218,17 @@ dyn_string navViewPlotRecordGetDpNamesToRecord(string configDatapoint)
{
newDatapoints[dynlen(newDatapoints)+1] = configDatapoint + "|"+ currentDatapoint + plotDpName + "|"+ i+"|" + fileNamePrefix + "|0";
}
+ else
+ {
+ LOG_WARN("Unable to connect to plot datapoint",plotDpName);
+ }
}
}
}
+ else
+ {
+ LOG_WARN("Plot configuration does not exist",configDatapoint);
+ }
return newDatapoints;
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
index 8f5cf5643cc..ae2f0d7a351 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfnav_view.ctl
@@ -24,6 +24,8 @@
//# global functions for the views of the Navigator.
//#
+#uses "nav_fw/gcf-util.ctl"
+
global string CURRENT_DP_MESSAGE = "Current selection in tree";
global dyn_string g_ContectMenuDpAccessableErrorText = "PUSH_BUTTON, No actions possible, 2, 0";
@@ -372,20 +374,23 @@ int navViewPlotGenerateGnuPlotScriptFile(int plotNumber, string plotTitle,
///////////////////////////////////////////////////////////////////////////
int navViewPlotGenerateGnuplotOutput(int plotNumber)
{
-
- if ((access(navConfigGetPathName(g_path_gnuplot) + navConfigGetPathName("/") + "wgnuplot.exe", F_OK)==0) &&
- (access(navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".dem", F_OK)==0))
+ string wgnuplotPath = navConfigGetPathName(g_path_gnuplot) + navConfigGetPathName("/") + "wgnuplot.exe";
+ string plotConfigPath = navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".dem";
+ string plotPath = navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".png";
+ if ((access(wgnuplotPath, F_OK)==0) &&
+ (access(plotConfigPath, F_OK)==0))
{
- system("start /b rm " + navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".png");
- system(navConfigGetPathName(g_path_gnuplot) + navConfigGetPathName("/") + "wgnuplot.exe " + navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber+ ".dem");
- if (access(navConfigGetPathName(g_path_temp) + navConfigGetPathName("/") + "gnuplot" + plotNumber + ".png", F_OK)!=0)
+ system("start /b rm " + plotPath);
+ system(wgnuplotPath + " " + plotConfigPath);
+ if (access(plotPath, F_OK)!=0)
{
+ LOG_ERROR("Error accessing plot file",plotPath);
return -1;
}
}
else
{
- DebugN("Error fincen wgnuplot and gnuplot1.dem");
+ LOG_ERROR("Error accessing wgnuplot and plot configuration",wgnuplotPath,plotConfigPath);
return -1;
}
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
index 040713824f9..490b6148e14 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-com.ctl
@@ -1,3 +1,29 @@
+//# gcfpa-com.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
+
+//#
+//# Functions to send events to the PropertyAgent
+//#
+
void sendEventToPA(string msg, string destSysName)
{
sendEvent(destSysName + "__gcfportAPI_DPAserver.", msg);
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
index 2b44723fdf9..b3bc8ec5a2f 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-cwd.ctl
@@ -1,3 +1,29 @@
+//# gcfpa-cwd.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
+
+//#
+//# GCF Connection watchdog
+//#
+
#uses "nav_fw/gcfpa-com.ctl"
#uses "nav_fw/gcf-util.ctl"
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
index 79624cac7f9..d86ed566079 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-pml.ctl
@@ -1,3 +1,29 @@
+//# gcfpa-pml.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
+
+//#
+//# Functions to handle propertysets from PVSS scripts and panels
+//#
+
#uses "nav_fw/gcfpa-com.ctl"
#uses "nav_fw/gcf-util.ctl"
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
index a6f3a96525d..e5c29487f4f 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
@@ -1,3 +1,29 @@
+//# gcfpa-prep.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
+
+//#
+//# Prepares the PVSS database for the PropertyAgent
+//#
+
main()
{
dyn_dyn_string xxdepes;
diff --git a/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl b/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
index fdbc3456449..3f190f896f5 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/treeView.ctl
@@ -1,21 +1,33 @@
-// file: treeView.ctl
-//
-// contents:
-// companion library of the generic panel tree/treeView.pnl which is used to
-// display items in a tree view form.
-//
-// laset modification dates: April 13, 00 1st version (v1.0)
-// author: Tilman Mueller - Astron
-// date author version modification
-//------------------------------------------------------------------------------
+//# treeView.ctl
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id$
-/** @name treeView.ctl library.
- * Companion library of the generic panel nav_fw/treeView.pnl which is used to
- * display items in a tree view form.
- * @author T. Mueller - Astron
- * @version 0.1
- */
-//@{
+//#
+//# companion library of the generic panel tree/treeView.pnl which is used to
+//# display items in a tree view form.
+//#
+//# last modification date: April 13, 00 1st version (v1.0)
+//# author: Tilman Mueller - Astron
+
+#uses "nav_fw/gcf-util.ctl"
/** @name "constants"
*/
--
GitLab